diff --git a/src/api/dataset/RepIndexSet/index.ts b/src/api/dataset/RepIndexSet/index.ts index 6acb4bb..6227015 100644 --- a/src/api/dataset/RepIndexSet/index.ts +++ b/src/api/dataset/RepIndexSet/index.ts @@ -65,3 +65,18 @@ export const getIndexType = ({ paramName, systemCode }): Promise => { }); }; + +/** 查询指标集类型树形结构 */ +export const getIndexSetTreeApi = async () => { + const res = await request.post({ + url: '/RepIndexSet/spi/dataset/RepIndexSet/IndexSetTree', + }); + if (res?.body?.menutree?.length > 0) { + const data = res.body.menutree + return data.sort((a:AppCustomRouteRecordRaw, b:AppCustomRouteRecordRaw) => { + return a?.props?.sort && b?.props?.sort ? a.props.sort - b.props.sort : 0 + }); + } + return []; +}; + diff --git a/src/router/index.ts b/src/router/index.ts index 998b416..d07a1ef 100644 --- a/src/router/index.ts +++ b/src/router/index.ts @@ -1328,7 +1328,7 @@ export const asyncRouterMap: AppRouteRecordRaw[] = [ name: 'RepDataSource', menuId: 'param/RepDataSource', meta: { - title: '数据源管理', + title: '数据源', sort:5 } }, @@ -1788,6 +1788,16 @@ export const asyncRouterMap: AppRouteRecordRaw[] = [ title: '报表模板管理' } }, + { + path: 'repVariableManagement', + component: () => import('@/views/reporting/RepVariableManagement/RepVariableManagement.vue'), + name: 'repVariableManagement', + menuId: 'reporting/repVariableManagement', + meta: { + title: '报告变量管理' + + } + }, { path: 'RepDataProblem', component: () => import('@/views/reporting/RepDataProblem/RepDataProblem.vue'), @@ -1844,18 +1854,6 @@ export const asyncRouterMap: AppRouteRecordRaw[] = [ sort:4, } }, - { - path: 'repVariableManagement', - component: () => import('@/views/reporting/RepVariableManagement/RepVariableManagement.vue'), - name: 'repVariableManagement', - menuId: 'repVariableManagement', - meta: { - title: '报告变量管理', - alwaysShow: true, - type:"ybt", - sort:5, - } - }, // { // path: 'codeRepItem', // component: () => import('@/views/dataset/CodeRepItem/CodeRepItem.vue'), diff --git a/src/views/dataset/IndexClassMs/IndexClassMs.vue b/src/views/dataset/IndexClassMs/IndexClassMs.vue index a97a687..c282ed8 100644 --- a/src/views/dataset/IndexClassMs/IndexClassMs.vue +++ b/src/views/dataset/IndexClassMs/IndexClassMs.vue @@ -95,25 +95,6 @@ const tableColumns = reactive([ default: (data: any) => { return ( <> - action(data.row, 'edit')}> - {t('tableDemo.edit')} - - { - return ( - <> - - {t('tableDemo.del')} - - - ) - } - }} - onConfirm={() => delData(data.row)} - > lookRule(data.row)}> {'查询'} diff --git a/src/views/dataset/RepDataModel/RepDataModel.vue b/src/views/dataset/RepDataModel/RepDataModel.vue index b47e7a1..c292dde 100644 --- a/src/views/dataset/RepDataModel/RepDataModel.vue +++ b/src/views/dataset/RepDataModel/RepDataModel.vue @@ -68,22 +68,14 @@ const tableColumns = reactive([ field: 'modelName', label: '模型名称' }, - { - field: 'description', - label: '描述' - }, - { - field: 'organCode', - label: '用户所属机构' - }, - { - field: 'createUser', - label: '登录用户' - }, { field: 'createDate', label: '创建日期' }, + { + field: 'description', + label: '描述' + }, { field: 'action', label: t('tableDemo.action'), diff --git a/src/views/dataset/RepIndexSet/RepIndexSet.vue b/src/views/dataset/RepIndexSet/RepIndexSet.vue index bfac317..0862425 100644 --- a/src/views/dataset/RepIndexSet/RepIndexSet.vue +++ b/src/views/dataset/RepIndexSet/RepIndexSet.vue @@ -7,7 +7,8 @@ import { delRepIndexSetApi, queryRepIndexSetApi, importExcelApiUrl, - exportExcelApi + exportExcelApi, + getIndexSetTreeApi } from '@/api/dataset/RepIndexSet' import { TableData } from '@/api/dataset/RepIndexSet/types' @@ -185,7 +186,7 @@ const searchSchema = reactive([ }, component: 'TreeSelect', optionApi: async () => { - const res = await getIndexCategoryTreeApi(); + const res = await getIndexSetTreeApi(); IndexTypeParamsList.value = res; indexType_param_LIST.value = res; res.forEach(item=>{ diff --git a/src/views/dataset/RepStore/components/Detail.vue b/src/views/dataset/RepStore/components/Detail.vue index 3ffb295..d7e11c1 100644 --- a/src/views/dataset/RepStore/components/Detail.vue +++ b/src/views/dataset/RepStore/components/Detail.vue @@ -37,7 +37,7 @@ const detailSchema = ref([ label: '存储规则id' }, { - field: 'scheme', + field: 'schema', label: '数据库用户' }, { diff --git a/src/views/dataset/RepStore/components/Write.vue b/src/views/dataset/RepStore/components/Write.vue index e040b11..6f4aa43 100644 --- a/src/views/dataset/RepStore/components/Write.vue +++ b/src/views/dataset/RepStore/components/Write.vue @@ -89,7 +89,7 @@ const formSchema = reactive([ }, }, { - field: 'scheme', + field: 'schema', label: '数据库用户', component: 'Input', componentProps: {