diff --git a/src/admin/api/renovation/scheme/equipment.js b/src/admin/api/renovation/scheme/equipment.js index 0a0a490..f35c31f 100644 --- a/src/admin/api/renovation/scheme/equipment.js +++ b/src/admin/api/renovation/scheme/equipment.js @@ -43,12 +43,12 @@ export function deleteData(ids) { // 查询 export function treelist(planType,speclevel) { return request({ - url: '/technicalPlan/treeCapacityEquipment/'+planType, + url: '/technicalPlan/treeCapacityEquipment', method: 'get', baseURL: "/plan-api", params: { planType: planType, - speclevel:speclevel + specLevel:speclevel } }) diff --git a/src/admin/views/renovation/scheme/compant/SCSB.vue b/src/admin/views/renovation/scheme/compant/SCSB.vue index e63af0a..882f80c 100644 --- a/src/admin/views/renovation/scheme/compant/SCSB.vue +++ b/src/admin/views/renovation/scheme/compant/SCSB.vue @@ -3,10 +3,10 @@ - + {{ item.label }} form.value.speclevel, + () => form.value.specLevel, (newval, oldval) => { if(newval){ gettreelist(null,newval); @@ -439,6 +439,10 @@ const inletlist = ref([ name: "bod", value: "0~400", }, + { + name: "ss", + value: "100~200", + }, { name: "nh3", value: "30~50", @@ -451,10 +455,7 @@ const inletlist = ref([ name: "tp", value: "2.5~5.0", }, - { - name: "ss", - value: "100~200", - }, + { name: "ph", value: "6~9", @@ -491,7 +492,7 @@ function watchData() { } }); - gettreelist(newForm.planType,newForm.speclevel); + gettreelist(newForm.planType,newForm.specLevel); form.value.equipmentParamId = newForm.equipmentDetail.map((item) => { return `${item.capacityId}-${item.equipmentId}`; }); @@ -503,7 +504,7 @@ function watchData() { // changeSelect(form.value.equipmentParamId); form.value.coliformRemoval = newForm.coliformRemoval; form.value.packingMethod = newForm.packingMethod; - form.value.speclevel = newForm.speclevel + form.value.specLevel = newForm.specLevel form.value.na2co3 = newForm.na2co3; form.value.pac = newForm.pac; form.value.naclo = newForm.naclo; @@ -601,7 +602,7 @@ function rest() { waterQualityStandardId: null, coliformRemoval: null, equipmentParamId: null, - speclevel:0 + specLevel:0 }; cost.value={ @@ -629,6 +630,7 @@ function handleSubmit() { return { capacityId: data[0], equipmentId: data[1], + }; }); debugger @@ -641,8 +643,10 @@ defineExpose({ }); async function gettreelist(type,level) { type =type||props.planType - level = level||form.value.speclevel - let res = await treelist(type,level); + level = level||form.value.specLevel + debugger + if((type!=""&&type!=null&&type!=undefined)&&(level!=""&&level!=null&&level!=undefined)){ + let res = await treelist(type,level); let data = res.data; data.forEach((element) => { element.children.forEach((item) => { @@ -651,6 +655,9 @@ async function gettreelist(type,level) { }); }); treeListData.value = data; + + } + } watch( @@ -665,6 +672,8 @@ watch( return { equipmentId: item.split("-")[1], capacityId: item.split("-")[0], + specLevel:form.value.specLevel + }; }); multipleConsumption(data).then((res) => { @@ -685,4 +694,7 @@ onMounted(() => { padding: 0 0 4px; margin: 5px; } +.cell-item{ + white-space: pre; +} diff --git a/src/admin/views/renovation/scheme/distdevice.vue b/src/admin/views/renovation/scheme/distdevice.vue index e428fba..74d2c5b 100644 --- a/src/admin/views/renovation/scheme/distdevice.vue +++ b/src/admin/views/renovation/scheme/distdevice.vue @@ -26,7 +26,7 @@ style="width: 100%" > { if (!document.startViewTransition) { diff --git a/src/admin/views/renovation/technicalPlan/compant/SCSB.vue b/src/admin/views/renovation/technicalPlan/compant/SCSB.vue index cd7152b..9a7300a 100644 --- a/src/admin/views/renovation/technicalPlan/compant/SCSB.vue +++ b/src/admin/views/renovation/technicalPlan/compant/SCSB.vue @@ -1,17 +1,32 @@