diff --git a/src/layouts/LayoutClassic/index.vue b/src/layouts/LayoutClassic/index.vue index 82252c4..70550b9 100644 --- a/src/layouts/LayoutClassic/index.vue +++ b/src/layouts/LayoutClassic/index.vue @@ -1,268 +1,271 @@ - - - - - - - - + + + + + + + + diff --git a/src/views/goverment/huizhou/projectList/components/ProjectSupervisionDiv/duty.vue b/src/views/goverment/huizhou/projectList/components/ProjectSupervisionDiv/duty.vue index 72bcde0..916977e 100644 --- a/src/views/goverment/huizhou/projectList/components/ProjectSupervisionDiv/duty.vue +++ b/src/views/goverment/huizhou/projectList/components/ProjectSupervisionDiv/duty.vue @@ -107,7 +107,7 @@ onMounted(async () => { }); }); formConfig.datas.enterpriseSn = stepOptions.value[active.value].dictValue + "名称"; - if (store.Message && store.Message.engineeringMains.length) { + if (store.Message && store.Message.engineeringMains.length && store.Message.engineeringMains.flat().length) { formData.value = store.Message.engineeringMains; } formConfig.formData = formData.value[active.value]; diff --git a/src/views/goverment/huizhou/projectList/components/ProjectSupervisionDiv/dutyForm.vue b/src/views/goverment/huizhou/projectList/components/ProjectSupervisionDiv/dutyForm.vue index 0ee080f..28451bb 100644 --- a/src/views/goverment/huizhou/projectList/components/ProjectSupervisionDiv/dutyForm.vue +++ b/src/views/goverment/huizhou/projectList/components/ProjectSupervisionDiv/dutyForm.vue @@ -192,7 +192,8 @@ const removeEngineeringMainPerson = (row: EngineeringMainPerson, ind: number) => !index >= 0 && formData.value[ind].engineeringMainPersonList?.splice(index, 1); }; const getMainData = async () => { - const data = await queryMainType({ mainType: formData.value[0].type }); + console.info(formData.value, "formData"); + const data = await queryMainType({ mainType: formData.value[0]?.type }); nameOptions.value = data.result; }; onMounted(async () => { diff --git a/src/views/goverment/huizhou/projectList/components/ProjectSupervisionDiv/overview.vue b/src/views/goverment/huizhou/projectList/components/ProjectSupervisionDiv/overview.vue index 49744f7..5634261 100644 --- a/src/views/goverment/huizhou/projectList/components/ProjectSupervisionDiv/overview.vue +++ b/src/views/goverment/huizhou/projectList/components/ProjectSupervisionDiv/overview.vue @@ -410,9 +410,11 @@ onMounted(async () => { structuralStyle.value = res1.result; if (store.Message) { form.value = store.Message; - form.value.position = "经度:" + store.Message.longitude + " 纬度:" + store.Message.latitude; + if (store.Message.longitude && store.Message.latitude) { + form.value.position = "经度:" + store.Message.longitude + " 纬度:" + store.Message.latitude; + } addressList.value = store.Message; - form.value.projectSecondType = store.Message.projectSecondType.split(",").map((item: string) => Number(item)); + form.value.projectSecondType = store.Message.projectSecondType?.split(",").map((item: string) => Number(item)); } const res2 = await getDicList({ dictType: "engineering_state" }); engineeringState.value = res2.result; @@ -451,9 +453,9 @@ watch( text-align: center; } :deep(.el-table__empty-text) { - min-height: 200px; display: flex; - justify-content: center; align-items: center; + justify-content: center; + min-height: 200px; }