Browse Source

修改子表现实方式

qin_25
herenshan112 3 months ago
parent
commit
32e6cbcfa3
  1. 2
      src/api/DesignForm/types.ts
  2. 3
      src/components/DesignForm/public/expand/userDialog.vue
  3. 6
      src/views/sysworkflow/lowcodepage/appPage/appPageForm/dataBoard.vue
  4. 33
      src/views/sysworkflow/lowcodepage/appPage/appPageForm/echatesUnit/winBox/dimMea.vue
  5. 2
      src/views/sysworkflow/lowcodepage/appPage/appPageForm/pageList.vue
  6. 2
      src/views/sysworkflow/lowcodepage/pageList.vue

2
src/api/DesignForm/types.ts

@ -229,6 +229,8 @@ export interface echatsViews {
title:string; title:string;
y:string[]; y:string[];
x:string[]; x:string[];
ysun?: string[];
xsun?: string[];
filter:string[]; filter:string[];
timelength:number; timelength:number;
search:searchInfo; search:searchInfo;

3
src/components/DesignForm/public/expand/userDialog.vue

@ -205,12 +205,13 @@ const defaultProps = {
@node-click="handleNodeClick" @node-click="handleNodeClick"
:props="defaultProps" :props="defaultProps"
highlight-current highlight-current
clearable
/> />
</div> </div>
</el-col> </el-col>
<el-col :span="12"> <el-col :span="12">
<div class="search"> <div class="search">
<el-input placeholder="请输入用户名" v-model="userName" /> <el-input placeholder="请输入用户名" v-model="userName" clearable />
<el-button type="primary" @click="searchClick">查询</el-button> <el-button type="primary" @click="searchClick">查询</el-button>
<el-button @click="resetClick">重置</el-button> <el-button @click="resetClick">重置</el-button>
</div> </div>

6
src/views/sysworkflow/lowcodepage/appPage/appPageForm/dataBoard.vue

@ -58,6 +58,8 @@ const echartsInfo = reactive<echatsViews>({
widthBox: 0, widthBox: 0,
y: [], y: [],
x: [], x: [],
ysun: [],
xsun: [],
filter: [], filter: [],
timelength: 1, timelength: 1,
search: { search: {
@ -82,8 +84,8 @@ const dimMeaList = () => {
console.log("获取维度义量化字段", data); console.log("获取维度义量化字段", data);
dimAry.value = data.data.dimList; dimAry.value = data.data.dimList;
meaAry.value = data.data.meaList; meaAry.value = data.data.meaList;
sunDimAry.value = data.data.sunDimList; sunDimAry.value = data.data.SunDimListAry;
sunMeaAry.value = data.data.sunMeaList; sunMeaAry.value = data.data.SunMeaListAry;
}); });
/*获取视图数据*/ /*获取视图数据*/
getChartCont({ id: props.state.formData.form.name }).then((data) => { getChartCont({ id: props.state.formData.form.name }).then((data) => {

33
src/views/sysworkflow/lowcodepage/appPage/appPageForm/echatesUnit/winBox/dimMea.vue

@ -508,6 +508,11 @@ const pickDimMeaSet = () => {
"确定选择----------checkListsunduLiang-------------->", "确定选择----------checkListsunduLiang-------------->",
checkListsunduLiang.value checkListsunduLiang.value
); );
console.log(
"确定选择----------checkListsund-------------->",
checkListsund.value
);
switch (props.dimMeaType) { switch (props.dimMeaType) {
case 2: case 2:
drawTitle.value = "添加度量"; drawTitle.value = "添加度量";
@ -529,6 +534,17 @@ const pickDimMeaSet = () => {
handleClose(); handleClose();
}; };
/**
@ 作者: 秦东
@ 时间: 2025-08-27 10:20:38
@ 功能: 组装子表数据结构
*/
const makeSunTableStruct = () => {
}
/** /**
@ 作者: 秦东 @ 作者: 秦东
@ 时间: 2025-06-30 14:28:37 @ 时间: 2025-06-30 14:28:37
@ -702,16 +718,17 @@ const checkListsunduLiang = ref([]);
</el-collapse> </el-collapse>
</div> </div>
</el-checkbox-group> </el-checkbox-group>
<el-divider <el-divider
v-if="props.dimMeaType == 3 || props.dimMeaType == 4" v-if="(props.dimMeaType == 3 || props.dimMeaType == 4) "
content-position="left" content-position="left"
>子表</el-divider >子表</el-divider
> >
<el-tabs v-if="props.dimMeaType != 2" type="border-card"> <el-tabs v-if="props.dimMeaType != 2" type="border-card">
<el-tab-pane v-for="(item, index) in props.sunMeaAry" :label="index"> <el-tab-pane v-for="(item, index) in props.sunMeaAry" :label="item.tableName" :key="index">
<el-checkbox-group v-model="checkListsund"> <el-checkbox-group v-model="checkListsund">
<div v-for="(iv, idx) in item"> <div v-for="(iv, idx) in item.tableUnit">
<el-checkbox :value="iv.field" :label="iv.title" size="large" :key="idx" /> <el-checkbox :value="iv" :label="iv.title" size="large" :key="idx" />
</div> </div>
</el-checkbox-group> </el-checkbox-group>
</el-tab-pane> </el-tab-pane>
@ -765,15 +782,15 @@ const checkListsunduLiang = ref([]);
</div> </div>
</el-checkbox-group> </el-checkbox-group>
<el-divider <el-divider
v-if="props.dimMeaType == 3 || props.dimMeaType == 4" v-if="(props.dimMeaType == 3 || props.dimMeaType == 4) "
content-position="left" content-position="left"
>子表</el-divider >子表</el-divider
> >
<el-tabs v-if="props.dimMeaType != 1 " type="border-card"> <el-tabs v-if="props.dimMeaType != 1 " type="border-card">
<el-tab-pane v-for="(item, index) in props.sunDimAry" :label="index"> <el-tab-pane v-for="(item, index) in props.sunDimAry" :label="item.tableName" :key="index">
<el-checkbox-group v-model="checkListsunduLiang"> <el-checkbox-group v-model="checkListsunduLiang">
<div v-for="(iv, idx) in item"> <div v-for="(iv, idx) in item.tableUnit">
<el-checkbox :value="iv.field" :label="iv.title" size="large" :key="idx" /> <el-checkbox :value="iv" :label="iv.title" size="large" :key="idx" />
</div> </div>
</el-checkbox-group> </el-checkbox-group>
</el-tab-pane> </el-tab-pane>

2
src/views/sysworkflow/lowcodepage/appPage/appPageForm/pageList.vue

@ -1617,7 +1617,7 @@ const delAllPick = () => {
</el-button> </el-button>
</div> </div>
<div> <div>
{{ state.view }}
<el-button-group class="ml-4"> <el-button-group class="ml-4">
<el-tooltip <el-tooltip
v-if="state.config.searchFormIsShow" v-if="state.config.searchFormIsShow"

2
src/views/sysworkflow/lowcodepage/pageList.vue

@ -991,7 +991,7 @@ const dialogConfirm = (editVal: string) => {
</el-button> </el-button>
</div> </div>
<div> <div>
{{ state.view }}
<el-button-group class="ml-4"> <el-button-group class="ml-4">
<el-tooltip <el-tooltip
v-if="state.config.searchFormIsShow" v-if="state.config.searchFormIsShow"

Loading…
Cancel
Save