This commit is contained in:
duanxiaohai 2024-10-10 14:13:59 +08:00
parent 00517d3a55
commit 60f0a4b2b1
1 changed files with 11 additions and 26 deletions

View File

@ -352,11 +352,11 @@
:class=" :class="
item.label == '学校' || item.label == '班级' ? 'widu' : '' item.label == '学校' || item.label == '班级' ? 'widu' : ''
" "
v-if="rightList?.length != 0 && item.show==true" v-if="rightList?.length != 0 && item.show == true"
> >
{{ item.label }} {{ item.label }}
</div> </div>
<div class="my-info-content" v-if="rightList?.length != 0"> <div class="my-info-content" v-if="rightList?.length != 0 && item.show == true">
<p>{{ pd(item.label, rightList[item.property]) }}</p> <p>{{ pd(item.label, rightList[item.property]) }}</p>
</div> </div>
</div> </div>
@ -868,7 +868,6 @@ const onClickTag2 = (name, label) => {
* 判断右侧显示的为表格还是列表0为列表1为表格 * 判断右侧显示的为表格还是列表0为列表1为表格
*/ */
const rightType = ref(0); const rightType = ref(0);
const rightTypeShow = ref(false);
// //
const rightList = ref([]); const rightList = ref([]);
// //
@ -887,15 +886,6 @@ const getTable = (url, csh) => {
.then((res) => { .then((res) => {
if (res.code == 200) { if (res.code == 200) {
tableType.data = res.data; tableType.data = res.data;
let ass = "";
tableType.columns.forEach((element) => {
// res.data[0].element.property
ass = element.property;
console.log(66, element.property,ass);
console.log(77, res.data[0][ass]);
});
// res.data[tableType.columns]
if (res?.count) { if (res?.count) {
pagination.total = res.count; pagination.total = res.count;
} }
@ -912,26 +902,21 @@ const getTable = (url, csh) => {
} else { } else {
// //
rightList.value = tableType.data[0]; rightList.value = tableType.data[0];
for(const key in tableType.data[0]){ for (const key in tableType.data[0]) {
if(tableType.data[0][key] == null){ if (tableType.data[0][key] == null) {
tableType.columns.forEach((item) => { tableType.columns.forEach((item) => {
if(item.property == key){ if (item.property == key) {
item.show=false item.show = false;
} }
}) });
}else{ } else {
tableType.columns.forEach((item) => { tableType.columns.forEach((item) => {
if(item.property == key){ if (item.property == key) {
item.show=true item.show = true;
} }
}) });
} }
} }
rightTypeShow.value = false;
// if (res.data[0].gzsj === null) {
// rightTypeShow.value = true;
// console.log(111, res.data[0].gzsj, rightTypeShow.value);
// }
} }
rightType.value = 0; rightType.value = 0;
} }