Commit ae6b06318b12853ce9838c95f7081aa0cd66159d

Authored by fengtao
1 parent d47c1083

refractor:修改报表相关

@@ -50,7 +50,7 @@ export const columns: BasicColumn[] = [ @@ -50,7 +50,7 @@ export const columns: BasicColumn[] = [
50 dataIndex: 'dataType', 50 dataIndex: 'dataType',
51 width: 120, 51 width: 120,
52 format: (_text: string, record: Recordable) => { 52 format: (_text: string, record: Recordable) => {
53 - return record.dataType === 0 ? '历史数据' : record.dataType === 1 ? '同比' : '环比'; 53 + return record.dataCompare === 0 ? '原始数据' : '聚合数据';
54 }, 54 },
55 }, 55 },
56 { 56 {
1 <template> 1 <template>
2 <div> 2 <div>
3 <BasicModal 3 <BasicModal
  4 + destroyOnClose
4 v-bind="$attrs" 5 v-bind="$attrs"
5 width="60rem" 6 width="60rem"
6 :height="heightNum" 7 :height="heightNum"
1 import { BasicColumn, FormSchema } from '/@/components/Table'; 1 import { BasicColumn, FormSchema } from '/@/components/Table';
2 import moment from 'moment'; 2 import moment from 'moment';
  3 +import { h } from 'vue';
  4 +import { Tag } from 'ant-design-vue';
3 5
4 // 表格配置 6 // 表格配置
5 export const columns: BasicColumn[] = [ 7 export const columns: BasicColumn[] = [
@@ -15,10 +17,10 @@ export const columns: BasicColumn[] = [ @@ -15,10 +17,10 @@ export const columns: BasicColumn[] = [
15 }, 17 },
16 { 18 {
17 title: '数据类型', 19 title: '数据类型',
18 - dataIndex: 'dataCompare', 20 + dataIndex: 'dataType',
19 width: 120, 21 width: 120,
20 format: (_text: string, record: Recordable) => { 22 format: (_text: string, record: Recordable) => {
21 - return record.dataCompare === 0 ? '历史数据' : record.dataCompare === 1 ? '同比' : '环比'; 23 + return record.dataCompare === 0 ? '原始数据' : '聚合数据';
22 }, 24 },
23 }, 25 },
24 { 26 {
@@ -33,8 +35,11 @@ export const columns: BasicColumn[] = [ @@ -33,8 +35,11 @@ export const columns: BasicColumn[] = [
33 title: '执行状态', 35 title: '执行状态',
34 dataIndex: 'status', 36 dataIndex: 'status',
35 width: 120, 37 width: 120,
36 - format: (_text: string, record: Recordable) => {  
37 - return record.status === 1 ? '成功' : record.status === 0 ? '失败' : '进行中'; 38 + customRender: ({ record }) => {
  39 + const status = record.status;
  40 + const color = status == 1 ? 'green' : status == 0 ? 'red' : 'blue';
  41 + const text = status == 1 ? '成功' : status == 0 ? '失败' : '进行中';
  42 + return h(Tag, { color: color }, () => text);
38 }, 43 },
39 }, 44 },
40 { 45 {
@@ -48,7 +48,7 @@ import { Popconfirm } from 'ant-design-vue'; @@ -48,7 +48,7 @@ import { Popconfirm } from 'ant-design-vue';
48 import { useModal } from '/@/components/Modal'; 48 import { useModal } from '/@/components/Modal';
49 import ReportPreviewModal from './ReportPreviewModal.vue'; 49 import ReportPreviewModal from './ReportPreviewModal.vue';
50 import { 50 import {
51 - exportPage, 51 + // exportPage,
52 deleteExportManage 52 deleteExportManage
53 } from '/@/api/export/exportManager'; 53 } from '/@/api/export/exportManager';
54 54
@@ -56,7 +56,7 @@ const searchInfo = reactive<Recordable>({}); @@ -56,7 +56,7 @@ const searchInfo = reactive<Recordable>({});
56 56
57 const [registerTable, { reload, setProps, setTableData }] = useTable({ 57 const [registerTable, { reload, setProps, setTableData }] = useTable({
58 title: '报表导出列表', 58 title: '报表导出列表',
59 - api: exportPage, 59 + // api: exportPage,
60 columns, 60 columns,
61 showIndexColumn: false, 61 showIndexColumn: false,
62 clickToRowSelect: false, 62 clickToRowSelect: false,
@@ -91,12 +91,13 @@ nextTick(() => { @@ -91,12 +91,13 @@ nextTick(() => {
91 setProps(selectionOptions); 91 setProps(selectionOptions);
92 setTableData([ 92 setTableData([
93 { 93 {
  94 + id:'121212',
94 reportConfigName: '1', 95 reportConfigName: '1',
95 organizationName: '2', 96 organizationName: '2',
96 dataCompare: 1, 97 dataCompare: 1,
97 executeWay: 1, 98 executeWay: 1,
98 executeTime: 1, 99 executeTime: 1,
99 - status: 2 100 + status: 1
100 } 101 }
101 ]) 102 ])
102 103