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

修改指标管理定义和属性的时间选择框以及数据问题报表界面的调试信息

Browse Source
main
于阔 8 months ago
parent 2162f48bff
commit 7e74faea44
12 changed files with 181 additions and 90 deletions
Show Stats Download Patch File Download Diff File

BIN
ordb-qd.zip
View File

Binary file not shown.

2
src/api/reporting/RepDataProblem/RepDataProblem/index.ts
Unescape View File

@ -49,7 +49,7 @@ export const exportExcelApi = (params: any) => {
/** 生成WordBytes */
export const saveWordBytes = (tId?: string, organCode?: string, date?: string) : Promise<IResponse> => {
return request.postJson({ url: '/RepDataProblem/sdi/reporting/RepDataProblem/RepDataProblemSaveWordBytes', data:{tId,organCode,date}});
return request.postJson({ url: '/RepDataProblem/spi/reporting/RepDataProblem/RepDataProblemSaveWordBytes', data:{tId,organCode,date}});
};
/** 获取某个字典 */

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

@ -109,25 +109,25 @@ const tableColumns = reactive<TableColumn[]>([
}
}
},
{
field: 'indexcalType',
label: '指标计算类型',
slots:{
default:(data)=>{
return <span>{data.row.indexcalType?indexCalType_param_LIST.value[data.row.indexcalType - 1]?.label:''}</span>
}
}
},
// {
// field: 'indexcalType',
// label: '指标计算类型',
// slots:{
// default:(data)=>{
// return <span>{data.row.indexcalType?indexCalType_param_LIST.value[data.row.indexcalType - 1]?.label:''}</span>
// }
// }
// },
{
field: 'indexdataType',
label: '指标数据类型',
slots:{
default:(data)=>{
return <span>{data.row.indexdataType?indexDataType_param_LIST.value[data.row.indexdataType - 1]?.label:''}</span>
}
}
},
// {
// field: 'indexdataType',
// label: '指标数据类型',
// slots:{
// default:(data)=>{
// return <span>{data.row.indexdataType?indexDataType_param_LIST.value[data.row.indexdataType - 1]?.label:''}</span>
// }
// }
// },
{
field: 'beginDate',
label: '开始日期'

50
src/views/dataset/CodeRepItem/components/Write.vue
Unescape View File

@ -311,35 +311,35 @@ const formSchema = reactive<FormSchema[]>([
label: "更新原因",
component: "Input",
},
{
field:"dateList",
label:"日期范围",
component: 'DatePicker',
colProps:{span:24},
componentProps: {
type:'daterange',
valueFormat: 'YYYYMMDD',
style:{width:'100%'}
},
},
// {
// field: 'beginDate',
// label: '开始日期',
// field:"dateList",
// label:"日期范围",
// component: 'DatePicker',
// colProps:{span:24},
// componentProps: {
// type:'daterange',
// valueFormat: 'YYYYMMDD',
// style: { width: '100%' }
// },
// },
// {
// field: 'endDate',
// label: '结束日期',
// component: 'DatePicker',
// componentProps: {
// valueFormat: 'YYYYMMDD',
// style: { width: '100%' }
// style:{width:'100%'}
// },
// },
{
field: 'beginDate',
label: '开始日期',
component: 'DatePicker',
componentProps: {
valueFormat: 'YYYYMMDD',
style: { width: '100%' }
},
},
{
field: 'endDate',
label: '结束日期',
component: 'DatePicker',
componentProps: {
valueFormat: 'YYYYMMDD',
style: { width: '100%' }
},
},
])
const rules = reactive({
@ -360,8 +360,8 @@ const submit = async () => {
})
if (valid) {
const formData = await getFormData();
formData.beginDate = formData.dateList[0];
formData.endDate = formData.dateList[1];
// formData.beginDate = formData.dateList[0];
// formData.endDate = formData.dateList[1];
return formData
}
}

15
src/views/dataset/CodeRepTarget/CodeRepTarget.vue
Unescape View File

@ -20,7 +20,7 @@ import Write from './components/Write.vue'
import { Dialog } from '@/components/Dialog'
import { getWidth } from '@/utils';
import { Upload } from '@/components/Upload'
import { TARGET_STATUS_LIST } from './constants';
import {useRoute} from "vue-router"
let indexsetCode = '';
@ -77,6 +77,15 @@ const tableColumns = reactive<TableColumn[]>([
field: 'targetName',
label: '指标属性名称'
},
{
field: 'status',
label: '状态',
slots:{
default:(data)=>{
return TARGET_STATUS_LIST.find(item=>item.value==data.row.status)?.label
}
}
},
{
field: 'beginDate',
label: '开始日期'
@ -85,6 +94,10 @@ const tableColumns = reactive<TableColumn[]>([
field: 'endDate',
label: '结束日期'
},
// {
// field: 'targetOrder',
// label: '排序',
// },
{
field: 'action',
label: t('tableDemo.action'),

8
src/views/dataset/CodeRepTarget/components/Detail.vue
Unescape View File

@ -24,10 +24,10 @@ const detailSchema = ref<DescriptionsSchema[]>([
field: 'targetName',
label: '栏名称'
},
{
field: 'targetOrder',
label: '排序'
},
// {
// field: 'targetOrder',
// label: '排序'
// },
{
field: 'status',
label: '状态'

64
src/views/dataset/CodeRepTarget/components/Write.vue
Unescape View File

@ -52,20 +52,39 @@ const formSchema = reactive<FormSchema[]>([
},
},
{
field: 'beginDate',
label: '开始日期',
component: 'DatePicker',
componentProps: {
valueFormat: 'YYYYMMDD',
style:{width:'100%'}
},
},
{
field: 'endDate',
label: '结束日期',
component: 'DatePicker',
componentProps: {
valueFormat: 'YYYYMMDD',
style:{width:'100%'}
},
},
// {
// field: 'beginDate',
// label: '开始日期',
// component: 'DatePicker',
// field: 'targetOrder',
// label: '排序',
// component: 'Input',
// componentProps: {
// valueFormat: 'YYYYMMDD',
// style:{width:'100%'}
// type:'number'
// },
// },
// {
// field: 'endDate',
// label: '结束日期',
// field:"dateList",
// label:"日期范围",
// component: 'DatePicker',
// colProps:{span:24},
// componentProps: {
// type:'daterange',
// valueFormat: 'YYYYMMDD',
// style:{width:'100%'}
// },
@ -78,26 +97,7 @@ const formSchema = reactive<FormSchema[]>([
options:TARGET_STATUS_LIST,
style:{width:'100%'},
},
value:1
},
{
field: 'targetOrder',
label: '排序',
component: 'Input',
componentProps: {
type:'number'
},
},
{
field:"dateList",
label:"日期范围",
component: 'DatePicker',
colProps:{span:24},
componentProps: {
type:'daterange',
valueFormat: 'YYYYMMDD',
style:{width:'100%'}
},
value:"1"
},
{
field: 'isOrgCollect',
@ -114,9 +114,9 @@ const rules = reactive({
indexsetCode: [required()],
targetCode: [required()],
targetName: [required()],
dateList: [required()],
// beginDate: [required()],
// endDate: [required()],
// dateList: [required()],
beginDate: [required()],
endDate: [required()],
})
const submit = async () => {
@ -126,8 +126,8 @@ const submit = async () => {
})
if (valid) {
let formData = await getFormData();
formData.beginDate = formData.dateList[0];
formData.endDate = formData.dateList[1];
// formData.beginDate = formData.dateList[0];
// formData.endDate = formData.dateList[1];
return formData
}
}

4
src/views/dataset/CodeRepTarget/constants.ts
Unescape View File

@ -1,11 +1,11 @@
//指标属性定义状态列表
export const TARGET_STATUS_LIST = [
{
value:1,
value:"1",
label:"启用"
},
{
value:0,
value:"0",
label:"停用"
},
]

9
src/views/dataset/IndexSearchServiceMs/IndexSearchServiceMs.vue
Unescape View File

@ -285,7 +285,7 @@ const onContextMenu = (row: any, column: any, cell: HTMLTableCellElement, event:
/>
</ContentWrap>
<Dialog v-model="dialogVisible" :title="dialogTitle" style="min-width:800px;">
<Dialog class="DrillingOrAnalysisDialog" v-model="dialogVisible" :title="dialogTitle" style="min-width:800px;">
<DrillingOrAnalysis
ref="DrillingOrAnalysisRef"
:current-row="currentRow"
@ -293,4 +293,9 @@ const onContextMenu = (row: any, column: any, cell: HTMLTableCellElement, event:
:drillingType="DrillingType"
/>
</Dialog>
</template>
</template>
<style scoped>
.DrillingOrAnalysisDialog >>> .el-scrollbar__bar{
display: none;
}
</style>

67
src/views/dataset/IndexSearchServiceMs/components/DataDillingByOrgan.vue
Unescape View File

@ -1,6 +1,7 @@
<!-- 数据分析 -->
<template>
<Table
class="dataTable"
align="center"
headerAlign="center"
:columns="tableColumns"
@ -8,7 +9,7 @@
:loading="loading"
row-key="randomCode"
lazy
style="max-height:300px;overflow:auto;"
height="200"
:showAction="false"
:load="loadJunior"
:tree-props="{ children: 'children', hasChildren: 'hasChildren'}"
@ -122,4 +123,68 @@ const loadJunior = async (
}
</script>
<style scoped>
.dataTable{
overflow-x: hidden;
}
.dataTable::-webkit-scrollbar {
width: 5px;
height: 1px;
}
.dataTable::-webkit-scrollbar-thumb {
border-radius: 10px;
background-color: skyblue;
background-image: -webkit-linear-gradient(45deg,rgba(255,255,255,0.2) 25%,transparent 25%,transparent 50%,rgba(255,255,255,0.2) 50%,rgba(255,255,255,0.2) 75%,transparent 75%,transparent);
}
.dataTable::-webkit-scrollbar-track {
box-shadow: inset 0 0 5px rgba(0,0,0,0.2);
background: #ededed;
border-radius: 10px;
}
.r-anchor-list {
background: var(--bg-color-content);
width: 100%;
display: flex;
align-items: center;
padding: 5px 20px;
position: absolute;
top: 0;
left: 0;
z-index: 100;
margin-bottom:10px;
}
.r-anchor-list a {
color: var(--color-main-text);
position: relative;
min-width: 88px;
height: 32px;
display: flex;
justify-content: center;
align-items: center;
padding: 0 20px;
border:none;
text-decoration: none;
}
.r-anchor-list a::after {
content: "";
position: absolute;
border-bottom: 2px solid;
border-color: var(--border-color-active);
bottom: 0;
left: 100%;
width: 0;
-webkit-transition: width 350ms, left 350ms;
-moz-transition: width 350ms, left 350ms;
transition: width 350ms, left 350ms
}
.r-anchor-list a:hover::after {
left: 0;
width: 100%;
-webkit-transition: width 350ms;
-moz-transition: width 350ms;
transition: width 350ms
}
</style>

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

@ -124,10 +124,10 @@ const tableColumns = reactive<TableColumn[]>([
}
}
},
{
field: 'description',
label: '规则描述'
},
// {
// field: 'description',
// label: '规则描述'
// },
// {
// field: 'createDate',
// label: '创建日期'

8
src/views/dataset/exportRepData.ts
Unescape View File

@ -65,6 +65,10 @@ export const VIndicatorAttrList = [//指标属性的数据List
column: "指标属性名称",//列项
columnValue: "targetName",//列项对应的值
},
{
column: "状态",//列项
columnValue: "status",//列项对应的值
},
{
column: '开始日期',
columnValue: 'beginDate',
@ -73,6 +77,10 @@ export const VIndicatorAttrList = [//指标属性的数据List
column: '结束日期',
columnValue: 'endDate',
},
// {
// column: '排序',
// columnValue: 'targetOrder',
// }
]
export const VIndicatorDefineList = [//指标定义的数据List
{

Write Preview
Loading…
Cancel
Save