Merge branch 'huku'

This commit is contained in:
庞东林
2021-12-28 15:38:06 +08:00
4 changed files with 4 additions and 4 deletions

View File

@@ -66,7 +66,7 @@ export default {
// align: 'center', // align: 'center',
// customRender: ({index}) => index + 1 // customRender: ({index}) => index + 1
// }, // },
{title: "监测时间", dataIndex: "monitorTime", sorter: true,}, // {title: "监测时间", dataIndex: "monitorTime", sorter: true,},
{title: "类别", dataIndex: "type", sorter: true,}, {title: "类别", dataIndex: "type", sorter: true,},
{title: "点位名称", dataIndex: "pointName", sorter: true,}, {title: "点位名称", dataIndex: "pointName", sorter: true,},
{title: "水质类别", dataIndex: "waterType", sorter: true,}, {title: "水质类别", dataIndex: "waterType", sorter: true,},

View File

@@ -67,7 +67,7 @@ const averageTableColumns = [
// align: 'center', // align: 'center',
// customRender: ({index}) => index + 1 // customRender: ({index}) => index + 1
// }, // },
{title: "监测时间", dataIndex: "monitorTime", sorter: true,}, // {title: "监测时间", dataIndex: "monitorTime", sorter: true,},
{title: "断面名称", dataIndex: "pointName", sorter: true,}, {title: "断面名称", dataIndex: "pointName", sorter: true,},
{title: "水温(℃)", dataIndex: "waterTemperature", sorter: true,}, {title: "水温(℃)", dataIndex: "waterTemperature", sorter: true,},
{title: "pH值", dataIndex: "ph", sorter: true,}, {title: "pH值", dataIndex: "ph", sorter: true,},

View File

@@ -67,7 +67,7 @@ export default {
// align: 'center', // align: 'center',
// customRender: ({index}) => index + 1 // customRender: ({index}) => index + 1
// }, // },
{title: "监测时间", dataIndex: "monitorTime", sorter: true,}, // {title: "监测时间", dataIndex: "monitorTime", sorter: true,},
{title: "类别", dataIndex: "type", sorter: true,}, {title: "类别", dataIndex: "type", sorter: true,},
{title: "点位名称", dataIndex: "pointName", sorter: true,}, {title: "点位名称", dataIndex: "pointName", sorter: true,},
{title: "水质类别", dataIndex: "waterType", sorter: true,}, {title: "水质类别", dataIndex: "waterType", sorter: true,},

View File

@@ -67,7 +67,7 @@ const averageTableColumns = [
// align: 'center', // align: 'center',
// customRender: ({index}) => index + 1 // customRender: ({index}) => index + 1
// }, // },
{title: "监测时间", dataIndex: "monitorTime", sorter: true,}, // {title: "监测时间", dataIndex: "monitorTime", sorter: true,},
{title: "断面名称", dataIndex: "sectionName", sorter: true,}, {title: "断面名称", dataIndex: "sectionName", sorter: true,},
{title: "水温(℃)", dataIndex: "wTemp", sorter: true,}, {title: "水温(℃)", dataIndex: "wTemp", sorter: true,},
{title: "pH值", dataIndex: "ph", sorter: true,}, {title: "pH值", dataIndex: "ph", sorter: true,},