p4khmxfwv
/
srdb-ui3.10
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

修改部分模块查询字段个数

Browse Source 
数据模型新增”新增规则“按钮跳转到数据模型参数界面
指标集类型和频率的新增，编辑的下拉框和首页展示
main
zhangxiaodi1 1 year ago
parent f45e37ccda
commit 9ebfa67995
8 changed files with 102 additions and 96 deletions
Show Stats Download Patch File Download Diff File

4
src/api/dataset/RepIndexSet/index.ts
Unescape View File

@ -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<IResponse> => {
/** 获取参数 */
export const getIndexType = ({ paramName, systemCode }): Promise<IResponse> => {
return request.postJson({
url: '/param/spi/param/systemparam',
data: {

10
src/views/dataset/CodeRepItem/CodeRepItem.vue
Unescape View File

@ -79,7 +79,7 @@ const tableColumns = reactive<TableColumn[]>([
field: 'indexcalType',
label: '指标计算类型'
},
{
field: 'indexdataType',
label: '指标数据类型'
@ -123,7 +123,7 @@ const tableColumns = reactive<TableColumn[]>([
<ElLink type="primary" underline={false} onClick={() => action(data.row, 'ruleconfig')}>
{'配置'}
</ElLink>
</>
)
}
@ -144,12 +144,6 @@ const searchSchema = reactive<FormSchema[]>([
componentProps: {},
component: 'Input'
},
{
field: 'indexType',
label: '指标类型',
componentProps: {},
component: 'Select'
},
{
field: 'indexDate',
label: '日期范围',

52
src/views/dataset/RepDataModel/RepDataModel.vue
Unescape View File

@ -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<TableColumn[]>([
{
field: 'action',
label: t('tableDemo.action'),
width: 160,
width: 200,
fixed: 'right',
slots: {
default: (data: any) => {
return (
<>
<ElLink type="primary" underline={false} onClick={() => getModelParam(data.row)}>
增加规则
</ElLink>
<ElLink type="primary" underline={false} onClick={() => action(data.row, 'edit')}>
{t('tableDemo.edit')}
</ElLink>
@ -131,18 +136,13 @@ const searchSchema = reactive<FormSchema[]>([
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)
}
</script>
@ -267,7 +283,7 @@ const exportExcel = async () => {
<template #buttons>
<ElButton type="primary" @click="AddAction">{{ t('tableDemo.add') }}</ElButton>
<Upload :url="importExcelApiUrl" :callback="getList"> <ElButton type="primary">导入</ElButton> </Upload>
<ElButton type="primary" @click="exportExcel()">导出</ElButton>
<ElButton type="primary" @click="exportExcel()" :disabled="disabled">导出</ElButton>
<ElButton :loading="delLoading" type="primary" :disabled="disabled" @click="delDataBatch()">
{{ t('tableDemo.del') }}
</ElButton>

1
src/views/dataset/RepDataModel/components/Write.vue
Unescape View File

@ -5,6 +5,7 @@ import { PropType, reactive, watch } from 'vue'
import { useValidator } from '@/hooks/web/useValidator'
import dayjs from 'dayjs'
const { required } = useValidator()
const props = defineProps({

53
src/views/dataset/RepIndexSet/RepIndexSet.vue
Unescape View File

@ -9,6 +9,7 @@ import {
importExcelApiUrl,
exportExcelApi
} from '@/api/dataset/RepIndexSet'
import { TableData } from '@/api/dataset/RepIndexSet/types'
import { useTable } from '@/hooks/web/useTable'
import { useI18n } from '@/hooks/web/useI18n'
@ -23,11 +24,21 @@ import { getWidth } from '@/utils';
import Detail from './components/Detail.vue'
import { Upload } from '@/components/Upload'
import { useRouter } from 'vue-router'
import { getIndexType } from '@/api/dataset/RepIndexSet';
import { transfDictList } from '@/utils';
const router = useRouter();
const { t } = useI18n()
const ids = ref<string[]>([])
let indexType_param_LIST = ref([]);
let frequency_param_LIST = ref([]);
//获取字典项
const getDictInfoList = async ()=>{
const res = await getIndexType({ paramName: 'frequency_param', systemCode: 'ordb' });
frequency_param_LIST = transfDictList(res.body.result);
}
getDictInfoList();
const { tableRegister, tableState, tableMethods } = useTable({
fetchDataApi: async () => {
@ -79,7 +90,13 @@ const tableColumns = reactive<TableColumn[]>([
},
{
field: 'frequency',
label: '频度'
label: '频度',
slots:{
default:(data)=>{
console.log(data.row.frequency,frequency_param_LIST[data.row.frequency].label);
return <span>{frequency_param_LIST[data.row.frequency].label}</span>
}
}
},
{
field: 'description',
@ -87,7 +104,12 @@ const tableColumns = reactive<TableColumn[]>([
},
{
field: 'indexsetType',
label: '指标集类型'
label: '指标集类型',
slots:{
default:(data)=>{
return <span>{indexType_param_LIST[parseInt(data.row.indexsetType) - 1]?.label}</span>
}
}
},
{
field: 'modelCode',
@ -148,28 +170,15 @@ const searchSchema = reactive<FormSchema[]>([
componentProps: {},
component: 'Input'
},
{
field: 'indexsetName',
label: '指标集名称',
componentProps: {},
component: 'Input'
},
{
field: 'frequency',
label: '频度',
componentProps: {},
component: 'Select'
},
{
field: 'indexsetType',
label: '指标集类型',
componentProps: {},
component: 'Select'
},
{
field: 'modelCode',
label: '数据模型编码',
componentProps: {},
optionApi: async () => {
const res = await getIndexType({ paramName: 'indexType_param', systemCode: 'ordb' });
indexType_param_LIST = transfDictList(res.body.result);
return indexType_param_LIST;
},
value: '1',
component: 'Select'
}
])

22
src/views/dataset/RepIndexSet/components/Write.vue
Unescape View File

@ -3,6 +3,8 @@ 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 { transfDictList } from '@/utils';
const { required } = useValidator()
@ -64,10 +66,12 @@ const formSchema = reactive<FormSchema[]>([
{
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: 'description',
@ -80,15 +84,17 @@ const formSchema = reactive<FormSchema[]>([
{
field: 'indexsetType',
label: '指标集类型',
component: 'Select',
componentProps: {
optionApi: async () => {
const res = await getIndexType({ paramName: 'indexType_param', systemCode: 'ordb' });
return transfDictList(res.body.result);
},
value: '1',
component: 'Select'
},
{
field: 'modelCode',
label: '数据模型编码',
component: 'Select',
component: 'Input',
componentProps: {
},

14
src/views/dataset/RepSetRule/RepSetRule.vue
Unescape View File

@ -172,7 +172,7 @@ const tableColumns = reactive<TableColumn[]>([
const searchSchema = reactive<FormSchema[]>([
{
field: 'ruleCode',
label: '指标集规则清单编码',
label: '规则编码',
componentProps: {},
component: 'Input'
},
@ -182,18 +182,6 @@ const searchSchema = reactive<FormSchema[]>([
componentProps: {},
component: 'Input'
},
{
field: 'ruleClass',
label: '规则分类',
componentProps: {},
component: 'Select'
},
{
field: 'startDate',
label: '启用日期',
componentProps: {},
component: 'DatePicker'
},
{
field: 'itemId',
label: '指标代码',

42
src/views/dataset/RepStoreParameter/RepStoreParameter.vue
Unescape View File

@ -22,9 +22,11 @@ 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"
const route = useRoute();
const { t } = useI18n()
const pageQuery = ref(route || null);
const modelCode = pageQuery.value?.query?.modelCode;
const ids = ref<string[]>([])
const { tableRegister, tableState, tableMethods } = useTable({
@ -120,29 +122,18 @@ const tableColumns = reactive<TableColumn[]>([
const searchSchema = reactive<FormSchema[]>([
{
field: 'modelCode',
label: '模型编码',
componentProps: {},
component: 'Input'
},
{
field: 'ruleId',
label: '规则编码',
componentProps: {},
component: 'Input'
},
{
field: 'name',
label: '名称',
componentProps: {},
component: 'Input'
},
{
field: 'paramType',
label: '参数类型',
componentProps: {},
component: 'Select'
}
field: 'modelCode',
label: '模型编码',
componentProps: {},
component: 'Input',
value:modelCode
},
{
field: 'name',
label: '模型名称',
componentProps: {},
component: 'Input'
}
])
const searchParams = ref({})
@ -150,6 +141,7 @@ const setSearchParams = (data: any) => {
searchParams.value = data
getList()
}
setSearchParams({modelCode:modelCode})
const dialogVisible = ref(false)
const dialogTitle = ref('')

Write Preview
Loading…
Cancel
Save