diff --git a/src/api/perfManage/goldTarget.ts b/src/api/perfManage/goldTarget.ts index 24e563ba..82e7b800 100644 --- a/src/api/perfManage/goldTarget.ts +++ b/src/api/perfManage/goldTarget.ts @@ -9,7 +9,7 @@ import { parseObjLineToHump } from '@/utils/parse-utils'; */ export async function listgoldData(query: Record) { let totalSQL = 'select count(*) as total from gold_kpi where 1=1 '; - let rowsSQL = 'select * from gold_kpi where 1=1 '; + let rowsSQL = 'SELECT gold_kpi.*,kpi_title.en_title FROM gold_kpi LEFT JOIN kpi_title on gold_kpi.kpi_id=kpi_title.kpi_id where 1=1 '; // 查询 let querySQL = ''; diff --git a/src/views/perfManage/goldTarget/index.vue b/src/views/perfManage/goldTarget/index.vue index 856dad79..e6ac862f 100644 --- a/src/views/perfManage/goldTarget/index.vue +++ b/src/views/perfManage/goldTarget/index.vue @@ -84,13 +84,15 @@ let tableColumns: ColumnsType = [ }, { title: '黄金指标项', - dataIndex: 'en_title', + dataIndex: 'enTitle', align: 'center', + sorter: (a:any, b:any) => { return 1}, }, { title: '值', dataIndex: 'value', align: 'center', + sorter: (a:any, b:any) => { return 1}, }, { title: '开始时间', @@ -100,6 +102,7 @@ let tableColumns: ColumnsType = [ if (!opt.value) return ''; return parseDateToStr(opt.value); }, + sorter: (a:any, b:any) => { return 1}, }, { title: '结束时间',