Compare commits

..

No commits in common. "60f0a4b2b18e1d20d510f40fbc83ac0a7d3938a4" and "1335d40a906eb378e268a9416570926db24efcc0" have entirely different histories.

1 changed files with 17 additions and 12 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 && item.show == true"> <div class="my-info-content" v-if="rightList?.length != 0">
<p>{{ pd(item.label, rightList[item.property]) }}</p> <p>{{ pd(item.label, rightList[item.property]) }}</p>
</div> </div>
</div> </div>
@ -647,7 +647,6 @@ const columnsList = reactive({
{ {
label: "工作单位", label: "工作单位",
property: "gzdw", property: "gzdw",
show: true,
}, },
{ {
label: "工作时间", label: "工作时间",
@ -868,6 +867,7 @@ 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([]);
// //
@ -902,21 +902,26 @@ 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;
} }