From 3e0fd44e0a0e6a11d7557e5d0f24b65dec7cbaa4 Mon Sep 17 00:00:00 2001 From: yangyuanshuai Date: Tue, 12 Nov 2024 18:08:32 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../RepDataProblem/RepDataProblem/index.ts | 4 +- .../dataset/CodeRepItem/components/Write.vue | 85 ++++++++++++++++--- .../dataset/IndexClassMs/IndexClassMs.vue | 24 +----- src/views/dataset/RepIndexSet/RepIndexSet.vue | 43 +++++----- src/views/dataset/RepSetRule/RepSetRule.vue | 61 ++++++------- .../RepDataProblem/RepDataProblem.vue | 17 +++- src/views/system/SysLoginLog/SysLoginLog.vue | 10 ++- 7 files changed, 153 insertions(+), 91 deletions(-) diff --git a/src/api/reporting/RepDataProblem/RepDataProblem/index.ts b/src/api/reporting/RepDataProblem/RepDataProblem/index.ts index ea68962..50f5506 100644 --- a/src/api/reporting/RepDataProblem/RepDataProblem/index.ts +++ b/src/api/reporting/RepDataProblem/RepDataProblem/index.ts @@ -48,8 +48,8 @@ export const exportExcelApi = (params: any) => { }; /** 生成WordBytes */ -export const saveWordBytes = (tId?: string, organCode?: string, dataDate?: string) : Promise => { - return request.postJson({ url: '/RepDataProblem/sdi/reporting/RepDataProblem/RepDataProblemSaveWordBytes', data:{tId,organCode,dataDate}}); +export const saveWordBytes = (tId?: string, organCode?: string, date?: string) : Promise => { + return request.postJson({ url: '/RepDataProblem/sdi/reporting/RepDataProblem/RepDataProblemSaveWordBytes', data:{tId,organCode,date}}); }; /** 获取某个字典 */ diff --git a/src/views/dataset/CodeRepItem/components/Write.vue b/src/views/dataset/CodeRepItem/components/Write.vue index c72c183..bb1e7be 100644 --- a/src/views/dataset/CodeRepItem/components/Write.vue +++ b/src/views/dataset/CodeRepItem/components/Write.vue @@ -3,8 +3,9 @@ import { Form, FormSchema } from '@/components/Form' import { useForm } from '@/hooks/web/useForm' import { PropType, reactive, watch } from 'vue' import { useValidator } from '@/hooks/web/useValidator' -import { getIndexType } from '@/api/dataset/RepIndexSet'; +import { getIndexSetTreeApi, getIndexType } from '@/api/dataset/RepIndexSet'; import { transfDictList } from '@/utils'; +import { getIndexCategoryTreeApi } from '@/api/dataset/IndexCategory'; const { required } = useValidator() @@ -82,15 +83,18 @@ const formSchema = reactive([ { field: 'frequency', label: '频度', - component: 'Select', - componentProps: { - + optionApi: async () => { + const res = await getIndexType({ paramName: 'frequency_param', systemCode: 'ordb' }); + return transfDictList(res.body.result); }, + value: '1', + component: 'Select' }, { field: 'isOrgCollect', label: '是否机构汇总', component: 'Input', + hidden:true, componentProps: { }, @@ -114,39 +118,92 @@ const formSchema = reactive([ { field: 'itemType1', label: '业务类型1', - component: 'Input', + colProps: { span: 100 }, componentProps: { - + checkStrictly: true, + nodeKey: 'id', + props: { children: 'childs', label: 'nodeName' }, + filterable: true, + collapseTags: true, + showCheckbox: true, + style: { minWidth: '200px' }, + checkOnClickNode: true }, + component: 'TreeSelect', + optionApi: async () => { + const res = await getIndexCategoryTreeApi(); + const res0=res.filter(item=>item.props.dicvalue=='Class0100'); + return res0; + } }, { field: 'itemType2', label: '业务类型2', - component: 'Input', + colProps: { span: 100 }, componentProps: { - + checkStrictly: true, + nodeKey: 'id', + props: { children: 'childs', label: 'nodeName' }, + filterable: true, + collapseTags: true, + showCheckbox: true, + style: { minWidth: '200px' }, + checkOnClickNode: true }, + component: 'TreeSelect', + optionApi: async () => { + const res = await getIndexCategoryTreeApi(); + const res0=res.filter(item=>item.props.dicvalue=='Class0200'); + return res0; + } }, { field: 'itemType3', label: '业务类型3', - component: 'Input', + colProps: { span: 100 }, componentProps: { - + checkStrictly: true, + nodeKey: 'id', + props: { children: 'childs', label: 'nodeName' }, + filterable: true, + collapseTags: true, + showCheckbox: true, + style: { minWidth: '200px' }, + checkOnClickNode: true }, + component: 'TreeSelect', + optionApi: async () => { + const res = await getIndexCategoryTreeApi(); + const res0=res.filter(item=>item.props.dicvalue=='Class0300'); + return res0; + } }, { field: 'itemType4', label: '业务类型4', - component: 'Input', + colProps: { span: 100 }, componentProps: { - + checkStrictly: true, + nodeKey: 'id', + props: { children: 'childs', label: 'nodeName' }, + filterable: true, + collapseTags: true, + showCheckbox: true, + style: { minWidth: '200px' }, + checkOnClickNode: true }, + component: 'TreeSelect', + optionApi: async () => { + const res = await getIndexCategoryTreeApi(); + const res0=res.filter(item=>item.props.dicvalue=='Class0400'); + return res0; + } }, { field: 'itemType5', label: '业务类型5', - component: 'Input', + component: 'TreeSelect', + colProps: { span: 100 }, componentProps: { }, @@ -154,6 +211,7 @@ const formSchema = reactive([ { field: 'indexType', label: '指标类型', + colProps: { span: 100 }, optionApi: async () => { const indexType = await getIndexType({ paramName: 'indexType_param', systemCode: 'ordb' }); return transfDictList(indexType.body.result); @@ -174,6 +232,7 @@ const formSchema = reactive([ { field: 'indexdataType', label: '指标数据类型', + colProps: { span: 100 }, optionApi: async () => { const indexDataType = await getIndexType({ paramName: 'indexDataType_param', systemCode: 'ordb' }); return transfDictList(indexDataType.body.result); diff --git a/src/views/dataset/IndexClassMs/IndexClassMs.vue b/src/views/dataset/IndexClassMs/IndexClassMs.vue index a20652f..1695e20 100644 --- a/src/views/dataset/IndexClassMs/IndexClassMs.vue +++ b/src/views/dataset/IndexClassMs/IndexClassMs.vue @@ -105,7 +105,8 @@ const tableColumns = reactive([ }, { field: 'itemName', - label: '指标名称' + label: '指标名称', + width:100 }, { field: 'businessDefinition', @@ -132,6 +133,8 @@ const tableColumns = reactive([ { field: 'beginDate', label: '生效日期', + width:180, + headerAlign:'center', slots:{ default:(data:any)=>{ return {data.row.beginDate}到{data.row.endDate} @@ -263,25 +266,6 @@ const queryOntInfo = (node,data)=>{ diff --git a/src/views/dataset/RepIndexSet/RepIndexSet.vue b/src/views/dataset/RepIndexSet/RepIndexSet.vue index 4b35fdd..173e3c2 100644 --- a/src/views/dataset/RepIndexSet/RepIndexSet.vue +++ b/src/views/dataset/RepIndexSet/RepIndexSet.vue @@ -173,28 +173,27 @@ const searchSchema = reactive([ field: 'indexsetType', label: '指标集类型', colProps: { span: 100 }, - componentProps: { - checkStrictly: true, - nodeKey: 'id', - props: { children: 'childs', label: 'nodeName' }, - filterable: true, - multiple: true, - collapseTags: true, - showCheckbox: true, - style: { minWidth: '200px' }, - checkOnClickNode: true, - }, - component: 'TreeSelect', - optionApi: async () => { - const res = await getIndexSetTreeApi(); - IndexTypeParamsList.value = res; - indexType_param_LIST.value = res; - res.forEach(item=>{ - indexType_param_LIST.value = indexType_param_LIST.value.concat(item.childs); - }); - console.log(indexType_param_LIST,"indexType_param_LIST"); - return res; - } + componentProps: { + checkStrictly: true, + nodeKey: 'id', + props: { children: 'childs', label: 'nodeName' }, + filterable: true, + collapseTags: true, + showCheckbox: true, + style: { minWidth: '200px' }, + checkOnClickNode: true + }, + component: 'TreeSelect', + optionApi: async () => { + const res = await getIndexSetTreeApi(); + IndexTypeParamsList.value = res; + indexType_param_LIST.value = res; + res.forEach(item => { + indexType_param_LIST.value = indexType_param_LIST.value.concat(item.childs); + }); + console.log(indexType_param_LIST, "indexType_param_LIST"); + return res; + } }, { field: 'indexDate', diff --git a/src/views/dataset/RepSetRule/RepSetRule.vue b/src/views/dataset/RepSetRule/RepSetRule.vue index 358cc21..d5baefa 100644 --- a/src/views/dataset/RepSetRule/RepSetRule.vue +++ b/src/views/dataset/RepSetRule/RepSetRule.vue @@ -57,14 +57,20 @@ const tableColumns = reactive([ }, { field: 'ruleCode', - label: '指标集规则清单编码', - width:180 - }, + label: '规则编码' + }, { field: 'ruleName', label: '规则名称', align: "left", - headerAlign: 'left', + }, + { + field: 'itemId', + label: '指标代码' + }, + { + field: 'itemName', + label: '指标名称' }, { field: 'ruleClass', @@ -75,14 +81,6 @@ const tableColumns = reactive([ } } }, - { - field: 'startDate', - label: '启用日期' - }, - { - field: 'ruleProperty', - label: '规则属性' - }, { field: 'ruleCycle', label: '规则周期', @@ -111,23 +109,32 @@ const tableColumns = reactive([ }, { field: 'createAccount', - label: '创建账户' + label: '创建账户', + hidden:true }, { field: 'createOrgan', - label: '创建机构' + label: '创建机构', + hidden:true }, { field: 'ruleJson', - label: '规则json' + label: '规则json', + hidden:true }, { field: 'ruleSql', - label: '规则sql' - }, + label: '规则sql', + hidden:true + }, { field: 'organCode', - label: '机构编码' + label: '机构编码', + hidden:true + }, + { + field: 'startDate', + label: '启用日期' }, { field: 'failDate', @@ -135,19 +142,13 @@ const tableColumns = reactive([ }, { field: 'indexCode', - label: '规则加工指标集编号' + label: '指标集编码', + hidden:true }, { field: 'machFormulas', - label: '规则加载所有公式' - }, - { - field: 'itemId', - label: '指标代码' - }, - { - field: 'itemName', - label: '指标名称' + label: '公式', + hidden:true }, { field: 'action', @@ -319,14 +320,14 @@ const exportExcel = async () => { @refresh="refresh" >