Merge remote-tracking branch 'origin/master'

zhaowei

9 天以前 008245cbe95c63a80f9a255378a5ffbe25d15085

 src/views/mdc/base/DeviceParamThresholdManagement.vue

@@ -25,6 +25,7 @@
                :data-source="driveTypeList"
                placeholder="请选择控制系统类型"
                :filter-option="filterOption"
                :allowClear="true"
              />
            </a-form-item>
          </a-col>
@@ -117,6 +118,18 @@
        name: 'DeviceParamThresholdManagement',
        description: '这是设备参数阈值管理页面',
        queryParam: {},
        /* 分页参数 */
        ipagination:{
          current: 1,
          pageSize: 30,
          pageSizeOptions: ['30', '50', '100'],
          showTotal: (total, range) => {
            return range[0] + "-" + range[1] + " 共" + total + "条"
          },
          showQuickJumper: true,
          showSizeChanger: true,
          total: 0
        },
        columns: [
          {
            title: '#',