From f45e37ccdafcd36b27bad44f900f6246042aa6b2 Mon Sep 17 00:00:00 2001 From: zhangxiaodi1 Date: Tue, 5 Nov 2024 20:41:32 +0800 Subject: [PATCH 1/5] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=A8=A1=E5=9E=8B?= =?UTF-8?q?=E6=98=A0=E5=B0=84=E5=89=8D=E7=AB=AF=E5=B1=95=E7=A4=BA=E5=AD=97?= =?UTF-8?q?=E6=AE=B5=E5=90=8D=E7=A7=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/dataset/RepStoreMapping/RepStoreMapping.vue | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/views/dataset/RepStoreMapping/RepStoreMapping.vue b/src/views/dataset/RepStoreMapping/RepStoreMapping.vue index 5edb280..7c4beaf 100644 --- a/src/views/dataset/RepStoreMapping/RepStoreMapping.vue +++ b/src/views/dataset/RepStoreMapping/RepStoreMapping.vue @@ -73,7 +73,7 @@ const tableColumns = reactive([ }, { field: 'mappingName', - label: '映射目标列名称)' + label: '映射目标列名称' }, { field: 'mappingCol', @@ -159,7 +159,7 @@ const searchSchema = reactive([ }, { field: 'mappingName', - label: '映射目标列名称)', + label: '映射目标列名称', componentProps: {}, component: 'Input' } From 9ebfa679954f53a8d25b9f8fda7015103cb15f4e Mon Sep 17 00:00:00 2001 From: zhangxiaodi1 Date: Tue, 5 Nov 2024 20:47:45 +0800 Subject: [PATCH 2/5] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=83=A8=E5=88=86?= =?UTF-8?q?=E6=A8=A1=E5=9D=97=E6=9F=A5=E8=AF=A2=E5=AD=97=E6=AE=B5=E4=B8=AA?= =?UTF-8?q?=E6=95=B0=20=E6=95=B0=E6=8D=AE=E6=A8=A1=E5=9E=8B=E6=96=B0?= =?UTF-8?q?=E5=A2=9E=E2=80=9D=E6=96=B0=E5=A2=9E=E8=A7=84=E5=88=99=E2=80=9C?= =?UTF-8?q?=E6=8C=89=E9=92=AE=E8=B7=B3=E8=BD=AC=E5=88=B0=E6=95=B0=E6=8D=AE?= =?UTF-8?q?=E6=A8=A1=E5=9E=8B=E5=8F=82=E6=95=B0=E7=95=8C=E9=9D=A2=20?= =?UTF-8?q?=E6=8C=87=E6=A0=87=E9=9B=86=E7=B1=BB=E5=9E=8B=E5=92=8C=E9=A2=91?= =?UTF-8?q?=E7=8E=87=E7=9A=84=E6=96=B0=E5=A2=9E=EF=BC=8C=E7=BC=96=E8=BE=91?= =?UTF-8?q?=E7=9A=84=E4=B8=8B=E6=8B=89=E6=A1=86=E5=92=8C=E9=A6=96=E9=A1=B5?= =?UTF-8?q?=E5=B1=95=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/dataset/RepIndexSet/index.ts | 4 +- src/views/dataset/CodeRepItem/CodeRepItem.vue | 10 +--- .../dataset/RepDataModel/RepDataModel.vue | 52 +++++++++++------- .../dataset/RepDataModel/components/Write.vue | 1 + src/views/dataset/RepIndexSet/RepIndexSet.vue | 53 +++++++++++-------- .../dataset/RepIndexSet/components/Write.vue | 22 +++++--- src/views/dataset/RepSetRule/RepSetRule.vue | 14 +---- .../RepStoreParameter/RepStoreParameter.vue | 42 ++++++--------- 8 files changed, 102 insertions(+), 96 deletions(-) diff --git a/src/api/dataset/RepIndexSet/index.ts b/src/api/dataset/RepIndexSet/index.ts index 07abca5..e791f3a 100644 --- a/src/api/dataset/RepIndexSet/index.ts +++ b/src/api/dataset/RepIndexSet/index.ts @@ -49,8 +49,8 @@ export const exportExcelApi = (params: any) => { return request.doExport({ url: '/RepIndexSet/sdi/dataset/RepIndexSet/RepIndexSetExportXls', params }); }; -/** 获取某个字典 */ -export const getCsckCheckType = ({ paramName, systemCode }): Promise => { +/** 获取参数 */ +export const getIndexType = ({ paramName, systemCode }): Promise => { return request.postJson({ url: '/param/spi/param/systemparam', data: { diff --git a/src/views/dataset/CodeRepItem/CodeRepItem.vue b/src/views/dataset/CodeRepItem/CodeRepItem.vue index e222649..aa8b9bd 100644 --- a/src/views/dataset/CodeRepItem/CodeRepItem.vue +++ b/src/views/dataset/CodeRepItem/CodeRepItem.vue @@ -79,7 +79,7 @@ const tableColumns = reactive([ field: 'indexcalType', label: '指标计算类型' }, - + { field: 'indexdataType', label: '指标数据类型' @@ -123,7 +123,7 @@ const tableColumns = reactive([ action(data.row, 'ruleconfig')}> {'配置'} - + ) } @@ -144,12 +144,6 @@ const searchSchema = reactive([ componentProps: {}, component: 'Input' }, - { - field: 'indexType', - label: '指标类型', - componentProps: {}, - component: 'Select' - }, { field: 'indexDate', label: '日期范围', diff --git a/src/views/dataset/RepDataModel/RepDataModel.vue b/src/views/dataset/RepDataModel/RepDataModel.vue index 1ebb0a7..317df36 100644 --- a/src/views/dataset/RepDataModel/RepDataModel.vue +++ b/src/views/dataset/RepDataModel/RepDataModel.vue @@ -22,8 +22,10 @@ import { Dialog } from '@/components/Dialog' import { getWidth } from '@/utils'; import Detail from './components/Detail.vue' import { Upload } from '@/components/Upload' -import { useRoute } from 'vue-router'; +import { useRoute,useRouter } from 'vue-router'; const route = useRoute(); +const router = useRouter(); + const pageQuery = ref(route || null); const modelCode = pageQuery.value?.query?.modelCode; const { t } = useI18n() @@ -85,12 +87,15 @@ const tableColumns = reactive([ { field: 'action', label: t('tableDemo.action'), - width: 160, + width: 200, fixed: 'right', slots: { default: (data: any) => { return ( <> + getModelParam(data.row)}> + 增加规则 + action(data.row, 'edit')}> {t('tableDemo.edit')} @@ -131,18 +136,13 @@ const searchSchema = reactive([ componentProps: {}, component: 'Input' }, - { - field: 'organCode', - label: '用户所属机构', - componentProps: {}, - component: 'Select' - }, - { - field: 'createDate', - label: '创建日期', - componentProps: {}, - component: 'DatePicker' - } + { + field: 'modelName', + label: '描述', + componentProps: {}, + component: 'Input' + } + ]) const searchParams = ref({}) @@ -179,6 +179,17 @@ const action = async (row: TableData, type: string) => { } } +/** 数据模型新增规则 **/ +const getModelParam = (data)=>{ + console.log(data); + router.push({ + name:'repStoreParameter', + query:{ + modelCode:data.modelCode, + } + }) +} + const AddAction = () => { dialogTitle.value = t('tableDemo.add') currentRow.value = undefined @@ -210,8 +221,8 @@ const delLoading = ref(false) /** 批量删除 **/ const delDataBatch = async () => { - const elTableExpose = await getElTableExpose() - ids.value = elTableExpose?.getSelectionRows().map((v: TableData) => { v.modelCode }) || [] + const elTableExpose = await getElTableExpose(); + ids.value = elTableExpose?.getSelectionRows().map((v: TableData) => { return v.modelCode }) || [] delLoading.value = true await delList(unref(ids).length).finally(() => { delLoading.value = false @@ -235,12 +246,17 @@ const delData = async (row: TableData) => { const disabled = ref(true) const onSelectionChange = (selection: TableData[]) => { +console.log(selection,"selection的信息"); disabled.value = selection.length === 0 } /** 导出Excel */ const exportExcel = async () => { - const data = { ...unref(searchParams) } + const data = { ...unref(searchParams) }; + const elTableExpose = await getElTableExpose(); + const list = elTableExpose?.getSelectionRows(); + data['list'] = list; + console.log(data,"导出的参数信息"); await exportExcelApi(data) } @@ -267,7 +283,7 @@ const exportExcel = async () => {