From d1a98a9f3fce25f5e8209fcb6d681bdb1ae67761 Mon Sep 17 00:00:00 2001 From: yangyuanshuai Date: Sat, 9 Nov 2024 15:08:51 +0800 Subject: [PATCH 1/4] =?UTF-8?q?scheme=E6=9B=B4=E6=94=B9=E4=B8=BAschema?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/dataset/RepStore/components/Detail.vue | 2 +- src/views/dataset/RepStore/components/Write.vue | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) 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: { From d8ae3cc028ad6fa6b61c8499e69ddc63fcecec3a Mon Sep 17 00:00:00 2001 From: yangyuanshuai Date: Sat, 9 Nov 2024 15:09:46 +0800 Subject: [PATCH 2/4] =?UTF-8?q?=E9=9A=90=E8=97=8F=E9=83=A8=E5=88=86?= =?UTF-8?q?=E5=B1=95=E7=A4=BA=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/router/index.ts | 2 +- .../dataset/IndexClassMs/IndexClassMs.vue | 19 ------------------- .../dataset/RepDataModel/RepDataModel.vue | 16 ++++------------ 3 files changed, 5 insertions(+), 32 deletions(-) diff --git a/src/router/index.ts b/src/router/index.ts index 998b416..c78f832 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 } }, 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'), From cea89e47ba56ae0be363b996814c62c7420020d6 Mon Sep 17 00:00:00 2001 From: yangyuanshuai Date: Sat, 9 Nov 2024 15:10:17 +0800 Subject: [PATCH 3/4] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E6=8C=87=E6=A0=87?= =?UTF-8?q?=E9=9B=86=E7=B1=BB=E5=9E=8B=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/dataset/RepIndexSet/index.ts | 15 +++++++++++++++ src/views/dataset/RepIndexSet/RepIndexSet.vue | 5 +++-- 2 files changed, 18 insertions(+), 2 deletions(-) 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/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=>{ From 52b5ac4ea7bd148951658510593e17f9a05dea86 Mon Sep 17 00:00:00 2001 From: zhangxiaodi1 Date: Sat, 9 Nov 2024 15:58:34 +0800 Subject: [PATCH 4/4] =?UTF-8?q?=E8=B0=83=E8=8A=82=E6=8A=A5=E5=91=8A?= =?UTF-8?q?=E5=8F=98=E9=87=8F=E7=AE=A1=E7=90=86router?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/router/index.ts | 22 ++++++++++------------ 1 file changed, 10 insertions(+), 12 deletions(-) diff --git a/src/router/index.ts b/src/router/index.ts index 998b416..bc1b622 100644 --- a/src/router/index.ts +++ b/src/router/index.ts @@ -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'),