diff --git a/ordb-qd.zip b/ordb-qd.zip deleted file mode 100644 index b4c4580..0000000 Binary files a/ordb-qd.zip and /dev/null differ diff --git a/src/api/reporting/RepDataProblem/RepDataProblem/index.ts b/src/api/reporting/RepDataProblem/RepDataProblem/index.ts index 50f5506..a948547 100644 --- a/src/api/reporting/RepDataProblem/RepDataProblem/index.ts +++ b/src/api/reporting/RepDataProblem/RepDataProblem/index.ts @@ -49,7 +49,7 @@ export const exportExcelApi = (params: any) => { /** 生成WordBytes */ export const saveWordBytes = (tId?: string, organCode?: string, date?: string) : Promise => { - return request.postJson({ url: '/RepDataProblem/sdi/reporting/RepDataProblem/RepDataProblemSaveWordBytes', data:{tId,organCode,date}}); + return request.postJson({ url: '/RepDataProblem/spi/reporting/RepDataProblem/RepDataProblemSaveWordBytes', data:{tId,organCode,date}}); }; /** 获取某个字典 */ diff --git a/src/views/dataset/CodeRepItem/CodeRepItem.vue b/src/views/dataset/CodeRepItem/CodeRepItem.vue index 62ac3e4..51611ee 100644 --- a/src/views/dataset/CodeRepItem/CodeRepItem.vue +++ b/src/views/dataset/CodeRepItem/CodeRepItem.vue @@ -109,25 +109,25 @@ const tableColumns = reactive([ } } }, - { - field: 'indexcalType', - label: '指标计算类型', - slots:{ - default:(data)=>{ - return {data.row.indexcalType?indexCalType_param_LIST.value[data.row.indexcalType - 1]?.label:''} - } - } - }, + // { + // field: 'indexcalType', + // label: '指标计算类型', + // slots:{ + // default:(data)=>{ + // return {data.row.indexcalType?indexCalType_param_LIST.value[data.row.indexcalType - 1]?.label:''} + // } + // } + // }, - { - field: 'indexdataType', - label: '指标数据类型', - slots:{ - default:(data)=>{ - return {data.row.indexdataType?indexDataType_param_LIST.value[data.row.indexdataType - 1]?.label:''} - } - } - }, + // { + // field: 'indexdataType', + // label: '指标数据类型', + // slots:{ + // default:(data)=>{ + // return {data.row.indexdataType?indexDataType_param_LIST.value[data.row.indexdataType - 1]?.label:''} + // } + // } + // }, { field: 'beginDate', label: '开始日期' diff --git a/src/views/dataset/CodeRepItem/components/Write.vue b/src/views/dataset/CodeRepItem/components/Write.vue index 3fac135..5280eaa 100644 --- a/src/views/dataset/CodeRepItem/components/Write.vue +++ b/src/views/dataset/CodeRepItem/components/Write.vue @@ -311,35 +311,35 @@ const formSchema = reactive([ label: "更新原因", component: "Input", }, - { - field:"dateList", - label:"日期范围", - component: 'DatePicker', - colProps:{span:24}, - componentProps: { - type:'daterange', - valueFormat: 'YYYYMMDD', - style:{width:'100%'} - }, - }, // { - // field: 'beginDate', - // label: '开始日期', + // field:"dateList", + // label:"日期范围", // component: 'DatePicker', + // colProps:{span:24}, // componentProps: { + // type:'daterange', // valueFormat: 'YYYYMMDD', - // style: { width: '100%' } - // }, - // }, - // { - // field: 'endDate', - // label: '结束日期', - // component: 'DatePicker', - // componentProps: { - // valueFormat: 'YYYYMMDD', - // style: { width: '100%' } + // style:{width:'100%'} // }, // }, + { + field: 'beginDate', + label: '开始日期', + component: 'DatePicker', + componentProps: { + valueFormat: 'YYYYMMDD', + style: { width: '100%' } + }, + }, + { + field: 'endDate', + label: '结束日期', + component: 'DatePicker', + componentProps: { + valueFormat: 'YYYYMMDD', + style: { width: '100%' } + }, + }, ]) const rules = reactive({ @@ -360,8 +360,8 @@ const submit = async () => { }) if (valid) { const formData = await getFormData(); - formData.beginDate = formData.dateList[0]; - formData.endDate = formData.dateList[1]; + // formData.beginDate = formData.dateList[0]; + // formData.endDate = formData.dateList[1]; return formData } } diff --git a/src/views/dataset/CodeRepTarget/CodeRepTarget.vue b/src/views/dataset/CodeRepTarget/CodeRepTarget.vue index 626498a..30ec69b 100644 --- a/src/views/dataset/CodeRepTarget/CodeRepTarget.vue +++ b/src/views/dataset/CodeRepTarget/CodeRepTarget.vue @@ -20,7 +20,7 @@ import Write from './components/Write.vue' import { Dialog } from '@/components/Dialog' import { getWidth } from '@/utils'; import { Upload } from '@/components/Upload' - +import { TARGET_STATUS_LIST } from './constants'; import {useRoute} from "vue-router" let indexsetCode = ''; @@ -77,6 +77,15 @@ const tableColumns = reactive([ field: 'targetName', label: '指标属性名称' }, + { + field: 'status', + label: '状态', + slots:{ + default:(data)=>{ + return TARGET_STATUS_LIST.find(item=>item.value==data.row.status)?.label + } + } + }, { field: 'beginDate', label: '开始日期' @@ -85,6 +94,10 @@ const tableColumns = reactive([ field: 'endDate', label: '结束日期' }, + // { + // field: 'targetOrder', + // label: '排序', + // }, { field: 'action', label: t('tableDemo.action'), diff --git a/src/views/dataset/CodeRepTarget/components/Detail.vue b/src/views/dataset/CodeRepTarget/components/Detail.vue index fdf03c3..923b504 100644 --- a/src/views/dataset/CodeRepTarget/components/Detail.vue +++ b/src/views/dataset/CodeRepTarget/components/Detail.vue @@ -24,10 +24,10 @@ const detailSchema = ref([ field: 'targetName', label: '栏名称' }, - { - field: 'targetOrder', - label: '排序' - }, + // { + // field: 'targetOrder', + // label: '排序' + // }, { field: 'status', label: '状态' diff --git a/src/views/dataset/CodeRepTarget/components/Write.vue b/src/views/dataset/CodeRepTarget/components/Write.vue index cf44173..f76072d 100644 --- a/src/views/dataset/CodeRepTarget/components/Write.vue +++ b/src/views/dataset/CodeRepTarget/components/Write.vue @@ -52,20 +52,39 @@ const formSchema = reactive([ }, }, + { + field: 'beginDate', + label: '开始日期', + component: 'DatePicker', + componentProps: { + valueFormat: 'YYYYMMDD', + style:{width:'100%'} + }, + }, + { + field: 'endDate', + label: '结束日期', + component: 'DatePicker', + componentProps: { + valueFormat: 'YYYYMMDD', + style:{width:'100%'} + }, + }, // { - // field: 'beginDate', - // label: '开始日期', - // component: 'DatePicker', + // field: 'targetOrder', + // label: '排序', + // component: 'Input', // componentProps: { - // valueFormat: 'YYYYMMDD', - // style:{width:'100%'} + // type:'number' // }, // }, // { - // field: 'endDate', - // label: '结束日期', + // field:"dateList", + // label:"日期范围", // component: 'DatePicker', + // colProps:{span:24}, // componentProps: { + // type:'daterange', // valueFormat: 'YYYYMMDD', // style:{width:'100%'} // }, @@ -78,26 +97,7 @@ const formSchema = reactive([ options:TARGET_STATUS_LIST, style:{width:'100%'}, }, - value:1 - }, - { - field: 'targetOrder', - label: '排序', - component: 'Input', - componentProps: { - type:'number' - }, - }, - { - field:"dateList", - label:"日期范围", - component: 'DatePicker', - colProps:{span:24}, - componentProps: { - type:'daterange', - valueFormat: 'YYYYMMDD', - style:{width:'100%'} - }, + value:"1" }, { field: 'isOrgCollect', @@ -114,9 +114,9 @@ const rules = reactive({ indexsetCode: [required()], targetCode: [required()], targetName: [required()], - dateList: [required()], - // beginDate: [required()], - // endDate: [required()], + // dateList: [required()], + beginDate: [required()], + endDate: [required()], }) const submit = async () => { @@ -126,8 +126,8 @@ const submit = async () => { }) if (valid) { let formData = await getFormData(); - formData.beginDate = formData.dateList[0]; - formData.endDate = formData.dateList[1]; + // formData.beginDate = formData.dateList[0]; + // formData.endDate = formData.dateList[1]; return formData } } diff --git a/src/views/dataset/CodeRepTarget/constants.ts b/src/views/dataset/CodeRepTarget/constants.ts index 83701da..74f7ec6 100644 --- a/src/views/dataset/CodeRepTarget/constants.ts +++ b/src/views/dataset/CodeRepTarget/constants.ts @@ -1,11 +1,11 @@ //指标属性定义状态列表 export const TARGET_STATUS_LIST = [ { - value:1, + value:"1", label:"启用" }, { - value:0, + value:"0", label:"停用" }, ] \ No newline at end of file diff --git a/src/views/dataset/IndexSearchServiceMs/IndexSearchServiceMs.vue b/src/views/dataset/IndexSearchServiceMs/IndexSearchServiceMs.vue index 31843a8..05590d9 100644 --- a/src/views/dataset/IndexSearchServiceMs/IndexSearchServiceMs.vue +++ b/src/views/dataset/IndexSearchServiceMs/IndexSearchServiceMs.vue @@ -285,7 +285,7 @@ const onContextMenu = (row: any, column: any, cell: HTMLTableCellElement, event: /> - + - \ No newline at end of file + + \ No newline at end of file diff --git a/src/views/dataset/IndexSearchServiceMs/components/DataDillingByOrgan.vue b/src/views/dataset/IndexSearchServiceMs/components/DataDillingByOrgan.vue index 32e2254..f284a77 100644 --- a/src/views/dataset/IndexSearchServiceMs/components/DataDillingByOrgan.vue +++ b/src/views/dataset/IndexSearchServiceMs/components/DataDillingByOrgan.vue @@ -1,6 +1,7 @@