同步

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
     }
 
   })

src/admin/views/renovation/scheme/compant/SCSB.vue

@@ -3,10 +3,10 @@
     <el-row>
       <el-col :span="24">
         <el-form-item label="类型选择">
-          <el-radio-group v-model="form.speclevel">
+          <el-radio-group v-model="form.specLevel">
             <el-radio
               size="large"
-              v-for="item in spec_level"
+              v-for="item in plan_spel_level"
               v-key="item.value"
               :label="item.value"
               >{{ item.label }}</el-radio
@@ -370,11 +370,11 @@ import {
   multipleConsumption,
 } from "@/api/renovation/scheme/equipmentEnergyConsumption";
 const { proxy } = getCurrentInstance();
-const { coliform_removal, technical_plan_type, packing_method,spec_level } = proxy.useDict(
+const { coliform_removal, technical_plan_type, packing_method,plan_spel_level } = proxy.useDict(
   "coliform_removal",
   "technical_plan_type",
   "packing_method",
-  "spec_level"
+  "plan_spel_level"
 );
 import {
   list as equipmentList,
@@ -419,7 +419,7 @@ watch(
   }
 );
 watch(
-  () => 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
+  level = level||form.value.specLevel
-  let res = await treelist(type,level);
+  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;
+}
 </style>

src/admin/views/renovation/scheme/distdevice.vue

@@ -26,7 +26,7 @@
             style="width: 100%"
           >
             <el-option
-              v-for="dict in spec_level"
+              v-for="dict in plan_spel_level "
               :key="dict.value"
               :label="dict.label"
               :value="dict.value"
@@ -196,12 +196,8 @@ import { list, postData, putData
    ,deleteData,updateComponentRunTime}
     from "@/api/renovation/scheme/equipmentEnergyConsumption";
 const { proxy } = getCurrentInstance();
-const { spec_level
+const { plan_spel_level
- } = proxy.useDict(
+ } = proxy.useDict("plan_spel_level");
-
-
-  "spec_level"
-);
 const showDetail = ref(false);
 const backCall = () => {
   if (!document.startViewTransition) {

src/admin/views/renovation/technicalPlan/compant/SCSB.vue

@@ -1,17 +1,32 @@
 <template>
   <el-form :model="form" ref="userRef" label-width="100px">
     <el-row>
+      <el-col :span="24">
       <el-form-item label="类型选择">
-        <el-radio-group v-model="form.speclevel">
+        <el-radio-group v-model="form.specLevel">
           <el-radio
             size="large"
-            v-for="item in spec_level"
+            v-for="item in plan_spec_level_foreign"
             v-key="item.value"
             :label="item.value"
             >{{ item.label }}</el-radio
           >
         </el-radio-group>
       </el-form-item>
+    </el-col>
+    <el-col :span="24">
+      <el-form-item label="电压选择">
+        <el-radio-group v-model="form.voltage">
+          <el-radio
+            size="large"
+            v-for="item in regional_voltage"
+            v-key="item.value"
+            :label="item.value"
+            >{{ item.label }}</el-radio
+          >
+        </el-radio-group>
+      </el-form-item>
+    </el-col>
       <el-col :span="24">
         <el-form-item label="进水指标" prop="phonenumber">
           <el-descriptions
@@ -211,12 +226,13 @@ import { list } from "@/api/renovation/technicalplan/capacity";
 import { list as equipmentEnergyConsumptionList,multipleConsumption  }
 from "@/api/renovation/technicalplan/equipmentEnergyConsumption";
 const { proxy } = getCurrentInstance();
-const { coliform_removal, technical_plan_type,packing_method,equipment_component_system,spec_level } =
+const { coliform_removal, technical_plan_type,packing_method,regional_voltage,equipment_component_system,plan_spec_level_foreign } =
  proxy.useDict(
   "coliform_removal",
   "technical_plan_type","packing_method",
   "equipment_component_system",
-  "spec_level"
+  "plan_spec_level_foreign",
+  "regional_voltage"
 );
 // import {
 //   list as equipmentList,
@@ -276,6 +292,10 @@ const inletlist = ref([
     name: "bod",
     value: "0~400",
   },
+  {
+    name: "ss",
+    value: "100~200",
+  },
   {
     name: "nh3",
     value: "30~50",
@@ -288,10 +308,7 @@ const inletlist = ref([
     name: "tp",
     value: "2.5~5.0",
   },
-  {
+
-    name: "ss",
-    value: "100~200",
-  },
   {
     name: "ph",
     value: "6~9",
@@ -330,6 +347,7 @@ function watchData(){
 
 
      form.value.speclevel=newForm.speclevel
+     form.value.voltage = newForm.voltage
      form.value.processCapacity=newForm.processCapacity
      cost.value=newForm?.cost||{
       laborCost:'',
@@ -520,4 +538,7 @@ onMounted(() => {
   padding: 0 0 4px;
   margin: 5px;
 }
+.cell-item{
+  white-space: pre;
+}
 </style>

src/admin/views/renovation/technicalPlan/index.vue

@@ -109,6 +109,15 @@
             label-width="100px"
           >
             <el-row>
+              <el-col :span="24">
+                <el-form-item label="地区名称" >
+                  <el-input
+                    v-model="form.country"
+                    placeholder="地区名称"
+
+                  />
+                </el-form-item>
+              </el-col>
               <el-col :span="24">
                 <el-form-item label="公司名称" >
                   <el-input