From 09a4a9b1d8970a3ec53f0e9bf6a638f347f9adb7 Mon Sep 17 00:00:00 2001 From: zhangxiaodi1 Date: Fri, 1 Nov 2024 17:28:37 +0800 Subject: [PATCH 1/4] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E6=A8=A1=E5=9E=8B?= =?UTF-8?q?=E6=98=A0=E5=B0=84=EF=BC=8C=E6=8C=87=E6=A0=87=E5=B1=9E=E6=80=A7?= =?UTF-8?q?=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/dataset/CodeRepTarget/index.ts | 60 ++++ src/api/dataset/CodeRepTarget/types.ts | 48 +++ src/api/dataset/RepStoreMapping/index.ts | 62 ++++ src/api/dataset/RepStoreMapping/types.ts | 60 ++++ src/router/index.ts | 24 ++ .../dataset/CodeRepTarget/CodeRepTarget.vue | 300 +++++++++++++++++ .../CodeRepTarget/components/Detail.vue | 51 +++ .../CodeRepTarget/components/Write.vue | 130 ++++++++ src/views/dataset/CodeRepTarget/constants.ts | 0 .../RepStoreMapping/RepStoreMapping.vue | 315 ++++++++++++++++++ .../RepStoreMapping/components/Detail.vue | 67 ++++ .../RepStoreMapping/components/Write.vue | 159 +++++++++ .../dataset/RepStoreMapping/constants.ts | 0 13 files changed, 1276 insertions(+) create mode 100644 src/api/dataset/CodeRepTarget/index.ts create mode 100644 src/api/dataset/CodeRepTarget/types.ts create mode 100644 src/api/dataset/RepStoreMapping/index.ts create mode 100644 src/api/dataset/RepStoreMapping/types.ts create mode 100644 src/views/dataset/CodeRepTarget/CodeRepTarget.vue create mode 100644 src/views/dataset/CodeRepTarget/components/Detail.vue create mode 100644 src/views/dataset/CodeRepTarget/components/Write.vue create mode 100644 src/views/dataset/CodeRepTarget/constants.ts create mode 100644 src/views/dataset/RepStoreMapping/RepStoreMapping.vue create mode 100644 src/views/dataset/RepStoreMapping/components/Detail.vue create mode 100644 src/views/dataset/RepStoreMapping/components/Write.vue create mode 100644 src/views/dataset/RepStoreMapping/constants.ts diff --git a/src/api/dataset/CodeRepTarget/index.ts b/src/api/dataset/CodeRepTarget/index.ts new file mode 100644 index 0000000..9d87560 --- /dev/null +++ b/src/api/dataset/CodeRepTarget/index.ts @@ -0,0 +1,60 @@ +import request from '@/config/axios'; +import type { TableData } from './types'; + +/** 获取表格数据 */ +export const getCodeRepTargetListApi = (data: any) => { + return request.postJson({ url: '/CodeRepTarget/spi/dataset/CodeRepTarget/CodeRepTargetQueryPage', data }); +}; + +/** 批量删除 */ +export const delCodeRepTargetListApi = (list: string[] | number[]): Promise => { + const _list = list.map(v => { + return { + crtid: v.crtid, + }; + }); + return request.postJson({ + url: '/CodeRepTarget/spi/dataset/CodeRepTarget/CodeRepTargetBatchDelete', + data: { + list: _list, + }, + }); +}; + +/** 删除 */ +export const delCodeRepTargetApi = (crtid?: string): Promise => { + return request.postJson({ url: '/CodeRepTarget/spi/dataset/CodeRepTarget/CodeRepTargetDelete', data: { crtid } }); +}; + +/** 保存 */ +export const saveCodeRepTargetApi = (data: Partial): Promise => { + return request.postJson({ url: '/CodeRepTarget/spi/dataset/CodeRepTarget/CodeRepTargetSave', data }); +}; + +/** 查询单条数据 */ +export const queryCodeRepTargetApi = (crtid?: string): Promise => { + return request.postJson({ url: '/CodeRepTarget/spi/dataset/CodeRepTarget/CodeRepTargetQueryOne', data: { crtid } }); +}; + +/** 同步导入 */ +export const importExcelApiUrl = '/CodeRepTarget/sui/dataset/CodeRepTarget/CodeRepTargetImportExcel'; + +/** 异步导入 */ +export const importExcelAsyncApiUrl = '/CodeRepTarget/sui/dataset/CodeRepTarget/CodeRepTargetImportAsyncExcel'; + +/** 导出 */ +export const exportExcelApi = (params: any) => { + return request.doExport({ url: '/CodeRepTarget/sdi/dataset/CodeRepTarget/CodeRepTargetExportXls', params }); +}; + +/** 获取某个字典 */ +export const getCsckCheckType = ({ paramName, systemCode }): Promise => { + return request.postJson({ + url: '/param/spi/param/systemparam', + data: { + paramName: paramName, + systemCode: systemCode, + }, + }); +}; + diff --git a/src/api/dataset/CodeRepTarget/types.ts b/src/api/dataset/CodeRepTarget/types.ts new file mode 100644 index 0000000..7d2aa3b --- /dev/null +++ b/src/api/dataset/CodeRepTarget/types.ts @@ -0,0 +1,48 @@ +/* eslint-disable lines-around-comment */ + +export type TableData = { + /** 指标集编码 */ + indexsetCode?: string + /** 栏编码 */ + targetCode?: string + /** 开始日期 */ + beginDate?: string + /** 结束日期 */ + endDate?: string + /** 栏名称 */ + targetName?: string + /** 排序 */ + targetOrder?: string + /** 状态 */ + status?: string + /** 是否机构汇总 */ + isOrgCollect?: string + /** 主键 */ + crtid?: string +} + +export interface DictItem { + dictId: string; + dictName: string; +} + +export type FormModel = { + /** 指标集编码 */ + indexsetCode?: string + /** 栏编码 */ + targetCode?: string + /** 开始日期 */ + beginDate?: string + /** 结束日期 */ + endDate?: string + /** 栏名称 */ + targetName?: string + /** 排序 */ + targetOrder?: string + /** 状态 */ + status?: string + /** 是否机构汇总 */ + isOrgCollect?: string + /** 主键 */ + crtid?: string +} diff --git a/src/api/dataset/RepStoreMapping/index.ts b/src/api/dataset/RepStoreMapping/index.ts new file mode 100644 index 0000000..3a67a10 --- /dev/null +++ b/src/api/dataset/RepStoreMapping/index.ts @@ -0,0 +1,62 @@ +import request from '@/config/axios'; +import type { TableData } from './types'; + +/** 获取表格数据 */ +export const getRepStoreMappingListApi = (data: any) => { + return request.postJson({ url: '/RepStoreMapping/spi/dataset/RepStoreMapping/RepStoreMappingQueryPage', data }); +}; + +/** 批量删除 */ +export const delRepStoreMappingListApi = (list: string[] | number[]): Promise => { + const _list = list.map(v => { + return { + modelCode: v.modelCode, + ruleId: v.ruleId, + srcCol: v.srcCol, + }; + }); + return request.postJson({ + url: '/RepStoreMapping/spi/dataset/RepStoreMapping/RepStoreMappingBatchDelete', + data: { + list: _list, + }, + }); +}; + +/** 删除 */ +export const delRepStoreMappingApi = (modelCode?: string, ruleId?: string, srcCol?: string): Promise => { + return request.postJson({ url: '/RepStoreMapping/spi/dataset/RepStoreMapping/RepStoreMappingDelete', data: { modelCode, ruleId, srcCol } }); +}; + +/** 保存 */ +export const saveRepStoreMappingApi = (data: Partial): Promise => { + return request.postJson({ url: '/RepStoreMapping/spi/dataset/RepStoreMapping/RepStoreMappingSave', data }); +}; + +/** 查询单条数据 */ +export const queryRepStoreMappingApi = (modelCode?: string, ruleId?: string, srcCol?: string): Promise => { + return request.postJson({ url: '/RepStoreMapping/spi/dataset/RepStoreMapping/RepStoreMappingQueryOne', data: { modelCode, ruleId, srcCol } }); +}; + +/** 同步导入 */ +export const importExcelApiUrl = '/RepStoreMapping/sui/dataset/RepStoreMapping/RepStoreMappingImportExcel'; + +/** 异步导入 */ +export const importExcelAsyncApiUrl = '/RepStoreMapping/sui/dataset/RepStoreMapping/RepStoreMappingImportAsyncExcel'; + +/** 导出 */ +export const exportExcelApi = (params: any) => { + return request.doExport({ url: '/RepStoreMapping/sdi/dataset/RepStoreMapping/RepStoreMappingExportXls', params }); +}; + +/** 获取某个字典 */ +export const getCsckCheckType = ({ paramName, systemCode }): Promise => { + return request.postJson({ + url: '/param/spi/param/systemparam', + data: { + paramName: paramName, + systemCode: systemCode, + }, + }); +}; + diff --git a/src/api/dataset/RepStoreMapping/types.ts b/src/api/dataset/RepStoreMapping/types.ts new file mode 100644 index 0000000..1b26b97 --- /dev/null +++ b/src/api/dataset/RepStoreMapping/types.ts @@ -0,0 +1,60 @@ +/* eslint-disable lines-around-comment */ + +export type TableData = { + /** 数据模型编码 */ + modelCode?: string + /** 规则id */ + ruleId?: string + /** 源列名 */ + srcCol?: string + /** 源列类型 */ + srcColType?: string + /** 映射目标列名称） */ + mappingName?: string + /** 映射目标列 */ + mappingCol?: string + /** 映射目标列类型 */ + mappingColType?: string + /** 映射目标列列号 */ + mappingColNum?: string + /** 注释字段 */ + remarks?: string + /** 组成联合主键 */ + primarykey?: string + /** 主键排序 */ + primaryKeyNum?: string + /** 标识是否为uuid */ + uuid?: string +} + +export interface DictItem { + dictId: string; + dictName: string; +} + +export type FormModel = { + /** 数据模型编码 */ + modelCode?: string + /** 规则id */ + ruleId?: string + /** 源列名 */ + srcCol?: string + /** 源列类型 */ + srcColType?: string + /** 映射目标列名称） */ + mappingName?: string + /** 映射目标列 */ + mappingCol?: string + /** 映射目标列类型 */ + mappingColType?: string + /** 映射目标列列号 */ + mappingColNum?: string + /** 注释字段 */ + remarks?: string + /** 组成联合主键 */ + primarykey?: string + /** 主键排序 */ + primaryKeyNum?: string + /** 标识是否为uuid */ + uuid?: string +} diff --git a/src/router/index.ts b/src/router/index.ts index 8fabd00..41be34e 100644 --- a/src/router/index.ts +++ b/src/router/index.ts @@ -1856,6 +1856,30 @@ export const asyncRouterMap: AppRouteRecordRaw[] = [ type:"ybt", sort:6, } + }, + { + path: 'codeRepTarget', + component: () => import('@/views/dataset/CodeRepTarget/CodeRepTarget.vue'), + name: 'codeRepTarget', + menuId: 'codeRepTarget', + meta: { + title: '指标属性', + alwaysShow: true, + type:"ybt", + sort:7, + } + }, + { + path: 'repStoreMapping', + component: () => import('@/views/dataset/RepStoreMapping/RepStoreMapping.vue'), + name: 'repStoreMapping', + menuId: 'repStoreMapping', + meta: { + title: '模型映射', + alwaysShow: true, + type:"ybt", + sort:8, + } } ] }, diff --git a/src/views/dataset/CodeRepTarget/CodeRepTarget.vue b/src/views/dataset/CodeRepTarget/CodeRepTarget.vue new file mode 100644 index 0000000..8c48e3c --- /dev/null +++ b/src/views/dataset/CodeRepTarget/CodeRepTarget.vue @@ -0,0 +1,300 @@ + + + \ No newline at end of file diff --git a/src/views/dataset/CodeRepTarget/components/Detail.vue b/src/views/dataset/CodeRepTarget/components/Detail.vue new file mode 100644 index 0000000..60d8280 --- /dev/null +++ b/src/views/dataset/CodeRepTarget/components/Detail.vue @@ -0,0 +1,51 @@ + + + diff --git a/src/views/dataset/CodeRepTarget/components/Write.vue b/src/views/dataset/CodeRepTarget/components/Write.vue new file mode 100644 index 0000000..bf15efa --- /dev/null +++ b/src/views/dataset/CodeRepTarget/components/Write.vue @@ -0,0 +1,130 @@ + + + + diff --git a/src/views/dataset/CodeRepTarget/constants.ts b/src/views/dataset/CodeRepTarget/constants.ts new file mode 100644 index 0000000..e69de29 diff --git a/src/views/dataset/RepStoreMapping/RepStoreMapping.vue b/src/views/dataset/RepStoreMapping/RepStoreMapping.vue new file mode 100644 index 0000000..1180dbd --- /dev/null +++ b/src/views/dataset/RepStoreMapping/RepStoreMapping.vue @@ -0,0 +1,315 @@ + + + \ No newline at end of file diff --git a/src/views/dataset/RepStoreMapping/components/Detail.vue b/src/views/dataset/RepStoreMapping/components/Detail.vue new file mode 100644 index 0000000..d76f494 --- /dev/null +++ b/src/views/dataset/RepStoreMapping/components/Detail.vue @@ -0,0 +1,67 @@ + + + diff --git a/src/views/dataset/RepStoreMapping/components/Write.vue b/src/views/dataset/RepStoreMapping/components/Write.vue new file mode 100644 index 0000000..433e10c --- /dev/null +++ b/src/views/dataset/RepStoreMapping/components/Write.vue @@ -0,0 +1,159 @@ + + + + diff --git a/src/views/dataset/RepStoreMapping/constants.ts b/src/views/dataset/RepStoreMapping/constants.ts new file mode 100644 index 0000000..e69de29 From 1b9cba9de8b4f8b683a47d64573cedda9abb34f7 Mon Sep 17 00:00:00 2001 From: yangyuanshuai Date: Fri, 1 Nov 2024 17:45:19 +0800 Subject: [PATCH 2/4] =?UTF-8?q?=E8=B0=83=E6=95=B4=E6=96=87=E4=BB=B6?= =?UTF-8?q?=E8=B7=AF=E5=BE=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../RepVariableManagement/index.ts | 16 ++++++++-------- .../RepVariableManagement/types.ts | 0 src/router/index.ts | 2 +- src/views/reporting/RepTemplate/RepTemplate.vue | 4 ++-- .../reporting/RepTemplate/components/Write.vue | 14 ++++++++++---- .../RepVariableManagement.vue | 4 ++-- .../RepVariableManagement/components/Detail.vue | 2 +- .../RepVariableManagement/components/Write.vue | 8 ++++++-- .../RepVariableManagement/constants.ts | 0 9 files changed, 30 insertions(+), 20 deletions(-) rename src/api/{dataset => reporting}/RepVariableManagement/index.ts (54%) rename src/api/{dataset => reporting}/RepVariableManagement/types.ts (100%) rename src/views/{dataset => reporting}/RepVariableManagement/RepVariableManagement.vue (97%) rename src/views/{dataset => reporting}/RepVariableManagement/components/Detail.vue (90%) rename src/views/{dataset => reporting}/RepVariableManagement/components/Write.vue (96%) rename src/views/{dataset => reporting}/RepVariableManagement/constants.ts (100%) diff --git a/src/api/dataset/RepVariableManagement/index.ts b/src/api/reporting/RepVariableManagement/index.ts similarity index 54% rename from src/api/dataset/RepVariableManagement/index.ts rename to src/api/reporting/RepVariableManagement/index.ts index a7fd1b8..226538d 100644 --- a/src/api/dataset/RepVariableManagement/index.ts +++ b/src/api/reporting/RepVariableManagement/index.ts @@ -3,7 +3,7 @@ import type { TableData } from './types'; /** 获取表格数据 */ export const getRepVariableManagementListApi = (data: any) => { - return request.postJson({ url: '/dataset/spi/dataset/RepVariableManagement/RepVariableManagementQueryPage', data }); + return request.postJson({ url: '/reporting/spi/reporting/RepVariableManagement/RepVariableManagementQueryPage', data }); }; /** 批量删除 */ @@ -14,7 +14,7 @@ export const delRepVariableManagementListApi = (list: string[] | number[]): Prom }; }); return request.postJson({ - url: '/dataset/spi/dataset/RepVariableManagement/RepVariableManagementBatchDelete', + url: '/reporting/spi/reporting/RepVariableManagement/RepVariableManagementBatchDelete', data: { list: _list, }, @@ -23,28 +23,28 @@ export const delRepVariableManagementListApi = (list: string[] | number[]): Prom /** 删除 */ export const delRepVariableManagementApi = (id?: string): Promise => { - return request.postJson({ url: '/dataset/spi/dataset/RepVariableManagement/RepVariableManagementDelete', data: { id } }); + return request.postJson({ url: '/reporting/spi/reporting/RepVariableManagement/RepVariableManagementDelete', data: { id } }); }; /** 保存 */ export const saveRepVariableManagementApi = (data: Partial): Promise => { - return request.postJson({ url: '/dataset/spi/dataset/RepVariableManagement/RepVariableManagementSave', data }); + return request.postJson({ url: '/reporting/spi/reporting/RepVariableManagement/RepVariableManagementSave', data }); }; /** 查询单条数据 */ export const queryRepVariableManagementApi = (id?: string): Promise => { - return request.postJson({ url: '/dataset/spi/dataset/RepVariableManagement/RepVariableManagementQueryOne', data: { id } }); + return request.postJson({ url: '/reporting/spi/reporting/RepVariableManagement/RepVariableManagementQueryOne', data: { id } }); }; /** 同步导入 */ -export const importExcelApiUrl = '/dataset/sui/dataset/RepVariableManagement/RepVariableManagementImportExcel'; +export const importExcelApiUrl = '/reporting/sui/reporting/RepVariableManagement/RepVariableManagementImportExcel'; /** 异步导入 */ -export const importExcelAsyncApiUrl = '/dataset/sui/dataset/RepVariableManagement/RepVariableManagementImportAsyncExcel'; +export const importExcelAsyncApiUrl = '/reporting/sui/reporting/RepVariableManagement/RepVariableManagementImportAsyncExcel'; /** 导出 */ export const exportExcelApi = (params: any) => { - return request.doExport({ url: '/dataset/sdi/dataset/RepVariableManagement/RepVariableManagementExportXls', params }); + return request.doExport({ url: '/reporting/sdi/reporting/RepVariableManagement/RepVariableManagementExportXls', params }); }; /** 获取某个字典 */ diff --git a/src/api/dataset/RepVariableManagement/types.ts b/src/api/reporting/RepVariableManagement/types.ts similarity index 100% rename from src/api/dataset/RepVariableManagement/types.ts rename to src/api/reporting/RepVariableManagement/types.ts diff --git a/src/router/index.ts b/src/router/index.ts index 41be34e..d57743d 100644 --- a/src/router/index.ts +++ b/src/router/index.ts @@ -1835,7 +1835,7 @@ export const asyncRouterMap: AppRouteRecordRaw[] = [ }, { path: 'repVariableManagement', - component: () => import('@/views/dataset/RepVariableManagement/RepVariableManagement.vue'), + component: () => import('@/views/reporting/RepVariableManagement/RepVariableManagement.vue'), name: 'repVariableManagement', menuId: 'repVariableManagement', meta: { diff --git a/src/views/reporting/RepTemplate/RepTemplate.vue b/src/views/reporting/RepTemplate/RepTemplate.vue index e34d917..bbe1932 100644 --- a/src/views/reporting/RepTemplate/RepTemplate.vue +++ b/src/views/reporting/RepTemplate/RepTemplate.vue @@ -21,7 +21,7 @@ import Write from './components/Write.vue' import { Dialog } from '@/components/Dialog' import { getWidth, transfDictList } from '@/utils'; import Detail from './components/Detail.vue' -import { REPORTING_TATUS_LIST } from './constants' +import { REPORTING_STATUS_LIST } from './constants' const { t } = useI18n() @@ -97,7 +97,7 @@ const tableColumns = reactive([ field: 'tStatus', label: '状态', formatter:(row:Recordable,_:TableColumn) =>{ - const state=REPORTING_TATUS_LIST.find((item)=>item.value===row.tStatus) + const state=REPORTING_STATUS_LIST.find((item)=>item.value===row.tStatus) if(state&&state.value =='1'){ return {state.label} } diff --git a/src/views/reporting/RepTemplate/components/Write.vue b/src/views/reporting/RepTemplate/components/Write.vue index af76c7c..5fd4ba6 100644 --- a/src/views/reporting/RepTemplate/components/Write.vue +++ b/src/views/reporting/RepTemplate/components/Write.vue @@ -4,6 +4,9 @@ import { useForm } from '@/hooks/web/useForm' import { PropType, reactive, watch } from 'vue' import { useValidator } from '@/hooks/web/useValidator' import { ElButton, ElMessage, ElMessageBox } from 'element-plus'; +import { getCategory } from '@/api/reporting/RepTemplate/RepTemplate'; +import { transfDictList } from '@/utils'; +import { REPORTING_STATUS_LIST } from '../constants'; const { required } = useValidator() @@ -33,9 +36,11 @@ const formSchema = reactive([ field: 'tCategory', label: '报告分类', component: 'Select', - componentProps: { - - }, + optionApi: async () => { + const res = await getCategory({ paramName: 'reportingType_param', systemCode: 'ordb' }); + return transfDictList(res.body.result); + }, + value: '1' }, { field: 'createUser', @@ -58,8 +63,9 @@ const formSchema = reactive([ label: '报告状态', component: 'Select', componentProps: { - + options:REPORTING_STATUS_LIST }, + value:'1' }, { field: 'tDescription', diff --git a/src/views/dataset/RepVariableManagement/RepVariableManagement.vue b/src/views/reporting/RepVariableManagement/RepVariableManagement.vue similarity index 97% rename from src/views/dataset/RepVariableManagement/RepVariableManagement.vue rename to src/views/reporting/RepVariableManagement/RepVariableManagement.vue index 8ba7524..1263085 100644 --- a/src/views/dataset/RepVariableManagement/RepVariableManagement.vue +++ b/src/views/reporting/RepVariableManagement/RepVariableManagement.vue @@ -6,8 +6,8 @@ import { delRepVariableManagementListApi, delRepVariableManagementApi, queryRepVariableManagementApi, -} from '@/api/dataset/RepVariableManagement' -import { TableData } from '@/api/dataset/RepVariableManagement/RepVariableManagement/types' +} from '@/api/reporting/RepVariableManagement' +import { TableData } from '@/api/reporting/RepVariableManagement/types' import { useTable } from '@/hooks/web/useTable' import { useI18n } from '@/hooks/web/useI18n' import { Table, TableColumn } from '@/components/Table' diff --git a/src/views/dataset/RepVariableManagement/components/Detail.vue b/src/views/reporting/RepVariableManagement/components/Detail.vue similarity index 90% rename from src/views/dataset/RepVariableManagement/components/Detail.vue rename to src/views/reporting/RepVariableManagement/components/Detail.vue index a9f2ea4..e5f947f 100644 --- a/src/views/dataset/RepVariableManagement/components/Detail.vue +++ b/src/views/reporting/RepVariableManagement/components/Detail.vue @@ -1,6 +1,6 @@