Merge branch 'develop-business-css' of http://121.37.111.42:3000/ThbTech/JavaProjectRepo into development-business-css

business-css/frontend/src/api/business/database/device/index.ts

@@ -48,3 +48,15 @@ export function deleteBatchDevices (queryParams:any){
     data: queryParams
   });
 }
+
+
+//获取所有项目列表
+export function sizeSchemaAll(queryParams:any){
+  return request({
+    url: '/devices/v2/size-schema/all' ,
+    method: 'get',
+    params:queryParams
+  });
+}
+
+

business-css/frontend/src/views/business/algorithmManagement/algorithmModel/index.vue

@@ -358,7 +358,7 @@ function changeShowResult(isShow:boolean){ // 切换显示结果模型
           <div @click="changeShowResult(true)" class="adddevice_navigation_right" :class="{'adddevice_navigation_activeright':isEchartsModel}">指标与图表</div>
         </div>
         <el-form ref="infoForm" :model="info" :rules="rules" label-width="100px" 
-          style="margin-top: 20px;" v-if="!isEchartsModel">
+          style="margin-top: 20px;height: calc(100vh - 275px);overflow: auto;" v-if="!isEchartsModel">
           <el-form-item label="版本" style="width: 100%;" >
             <el-input v-model="info.versionTag" style="width: 100%" placeholder="输入算法名称" :disabled="true"></el-input>
           </el-form-item>

business-css/frontend/src/views/business/algorithmManagement/modelTrainTask/index.vue

@@ -858,7 +858,7 @@ function revokeExpression(){
           <div @click="changeShowResult(true)" class="adddevice_navigation_right" :class="{'adddevice_navigation_activeright':isEchartsModel}">训练结果</div>
         </div>
         <el-form ref="infoForm" :model="info" :rules="rules" label-width="100px" 
-          style="margin-top: 20px;" v-if="!isEchartsModel">
+          style="margin-top: 20px;height: calc(100vh - 275px);overflow: auto;"  v-if="!isEchartsModel">
           <el-form-item label="任务ID" style="width: 100%;"  >
             <el-input v-model="info.taskId" style="width: 100%" :disabled="true"></el-input>
           </el-form-item>

business-css/frontend/src/views/business/database/criticalData/index.vue

@@ -9,8 +9,21 @@ import { onMounted, ref, nextTick } from "vue";
 import { ElForm, ElMessage, ElMessageBox } from "element-plus";
 import { searchCriticalDataPage,addCriticalData,updateCriticalData,deleteCriticalData,deleteBatchCriticalData} from "@/api/business/database/criticalData";
 import { getDictItemById } from '@/api/dict';
+import { sizeSchemaAll } from "@/api/business/database/device";
+
 import Page from '@/components/Pagination/page.vue'
 import { getToken } from '@/utils/auth'
+
+//获取所有项目列表
+const sizeSchemaInfo:any = ref({});
+
+async function getSizeSchemaList(){
+  let result = await sizeSchemaAll({})
+  sizeSchemaInfo.value = result
+}
+
+
+
 const url = import.meta.env.VITE_APP_BASE_API;
 // 搜索框
 const queryParams:any = ref({
@@ -38,6 +51,10 @@ function gettableData() {
   loading.value = true;
   searchCriticalDataPage(params).then((result:any) => {
     tableData.value = result.records;
+    result.records.forEach((item:any) => {
+      item.size = JSON.parse(item.size)
+
+    })
     total.value = result.total;
     loading.value = false;
   }).catch((err) => {
@@ -54,7 +71,7 @@ function handleSelectionChange(val: any) {
 
 
 const menuData:any = ref([])
-
+const sourceTempData:any = ref([])
 // 查询字典项
 function menuInit() {
   let params = {
@@ -65,6 +82,7 @@ function menuInit() {
   getDictItemById(params).then((result: any) => {
     menuData.value = result.data.records;
     queryParams.value.type = menuData.value[0].itemCode
+    sourceTempData.value = sizeSchemaInfo.value[queryParams.value.type].fields
     gettableData();
   }).catch((err: any) => {
   });
@@ -72,6 +90,7 @@ function menuInit() {
 
 function handleMenu(row:any) {
    queryParams.value.type = row.itemCode
+  sourceTempData.value = sizeSchemaInfo.value[queryParams.value.type].fields
    gettableData()
 }
 
@@ -100,8 +119,13 @@ function addClick() {
     fissileConcentration: null,
     isotopicAbundance: null,
     keffValue: null,
+    size: {},
 
   };
+  sourceTempData.value.forEach((item:any) => {
+    info.value.size[item.key] = null
+  })
+
   customAttrsData.value = []
   dialogVisible.value = true;
 }
@@ -114,6 +138,7 @@ function confirmClick(formEl: any) {
 
         const params = {
           ...info.value,
+          size: JSON.stringify(info.value.size),
         }
         addCriticalData(params).then((res:any) => {
           if(res === true){
@@ -129,13 +154,8 @@ function confirmClick(formEl: any) {
         });
       } else if (info.value.criticalId) {
         const params = {
-            criticalId: info.value.criticalId,
+            ...info.value,
-            deviceType: info.value.deviceType,
+            size: JSON.stringify(info.value.size),
-            diameter: info.value.diameter,
-            height: info.value.height,
-            fissileConcentration: info.value.fissileConcentration,
-            isotopicAbundance: info.value.isotopicAbundance,
-            keffValue: info.value.keffValue,
           }
         updateCriticalData(params).then((res:any) => {
           if(res === true){
@@ -169,6 +189,14 @@ const rules = ref({
 function editClick(row: any) {
   title.value = "修改临界数据";
   info.value = JSON.parse(JSON.stringify(row));
+
+  sourceTempData.value = sizeSchemaInfo.value[queryParams.value.type].fields
+  if(row.size == null || "object" != typeof row.size){
+    info.value.size = {}
+    sourceTempData.value.forEach((item:any) => {
+      info.value.size[item.key] = null
+    })
+  }
   dialogVisible.value = true;
 }
 
@@ -278,6 +306,7 @@ function handleNumberInput(field: string) {
 
 
 onMounted(() => {
+  getSizeSchemaList()
   menuInit()
 });
 </script>
@@ -323,10 +352,15 @@ onMounted(() => {
         :header-cell-style="{ background: 'rgb(250 250 250)', color: '#383838', height: '50px' }">
         <el-table-column type="selection" width="50" align="center"></el-table-column>
         <el-table-column type="index" label="序号" width="70" align="center"></el-table-column>
-        <el-table-column prop="diameter" label="等效直径" min-width="100"></el-table-column>
+        <el-table-column   v-for="(item,index) in sourceTempData"   :label="item.label" min-width="100">
+          <template #default="scope">
+            {{ scope.row.size[item.key] }}
+          </template>
+        </el-table-column>
+        <!-- <el-table-column prop="diameter" label="等效直径" min-width="100"></el-table-column>
         <el-table-column prop="height" label="等效高度" min-width="100"></el-table-column>
         <el-table-column prop="fissileConcentration" label="核材料浓度" min-width="100"></el-table-column>
-        <el-table-column prop="isotopicAbundance" label="同位素丰度" min-width="100"></el-table-column>
+        <el-table-column prop="isotopicAbundance" label="同位素丰度" min-width="100"></el-table-column> -->
         <el-table-column prop="keffValue" label="对应Keff值" min-width="100"></el-table-column>
         <el-table-column prop="modifier" label="创建人" width="120"></el-table-column>
         <el-table-column prop="createdAt" label="创建时间" width="200">
@@ -355,20 +389,111 @@ onMounted(() => {
       append-to-body width="677px" height="530px">
       
       <el-form ref="infoForm" :model="info" :rules="rules" label-width="100px" >
-        <el-form-item label="等效直径" style="width: 100%;">
+         <el-form-item :label="item.label" style="width: 100%;" v-for="item in sourceTempData">
-          <el-input v-model="info.diameter" style="width: 100%" placeholder="请输入等效直径" 
+          <el-input-number 
-          @input="handleNumberInput('diameter')"></el-input>
+              placeholder="请输入长度"
+              v-model="info.size[item.key]" 
+              :min="0" 
+              align="left"
+              :controls="false"
+              style="width: 100%"
+            >
+            <template #suffix>{{item.unit}}</template>
+          </el-input-number>
         </el-form-item>
-        <el-form-item label="等效高度"  style="width: 100%;">
+        <el-form-item label="铀浓度（g/L）" style="width: 100%;" >
-          <el-input v-model="info.height" style="width: 100%" placeholder="请输入等效高度"
+          <el-input-number 
-          @input="handleNumberInput('height')"></el-input>
+              placeholder="请输入长度"
+              v-model="info.u_concentration" 
+              :min="0" 
+              align="left"
+              :controls="false"
+              style="width: 100%"
+            >
+          </el-input-number>
         </el-form-item>
-        <el-form-item label="核材料浓度" style="width: 100%;">
+
-          <el-input v-model="info.fissileConcentration" style="width: 100%" placeholder="请输入核材料浓度"
+        <el-form-item label="铀富集度" style="width: 100%;" >
-          @input="handleNumberInput('fissileConcentration')">
+          <el-input-number 
-             <!-- <template #append>m</template> -->
+              placeholder="请输入长度"
-          </el-input>
+              v-model="info.uEnrichment" 
+              :min="0" 
+              align="left"
+              :controls="false"
+              style="width: 100%"
+            >
+          </el-input-number>
         </el-form-item>
+        <el-form-item label="钚浓度" style="width: 100%;" >
+          <el-input-number 
+              placeholder="请输入长度"
+              v-model="info.puConcentration" 
+              :min="0" 
+              align="left"
+              :controls="false"
+              style="width: 100%"
+            >
+          </el-input-number>
+        </el-form-item>
+
+
+        <el-form-item label="PU-238占比" style="width: 100%;" >
+          <el-input-number 
+              placeholder="请输入长度"
+              v-model="info.ePu238" 
+              :min="0" 
+              align="left"
+              :controls="false"
+              style="width: 100%"
+            >
+          </el-input-number>
+        </el-form-item>
+        <el-form-item label="PU-239占比" style="width: 100%;" >
+          <el-input-number 
+              placeholder="请输入长度"
+              v-model="info.ePu239" 
+              :min="0" 
+              align="left"
+              :controls="false"
+              style="width: 100%"
+            >
+          </el-input-number>
+        </el-form-item>
+        <el-form-item label="PU-240占比" style="width: 100%;" >
+          <el-input-number 
+              placeholder="请输入长度"
+              v-model="info.ePu240" 
+              :min="0" 
+              align="left"
+              :controls="false"
+              style="width: 100%"
+            >
+          </el-input-number>
+        </el-form-item>
+        <el-form-item label="PU-241占比" style="width: 100%;" >
+          <el-input-number 
+              placeholder="请输入长度"
+              v-model="info.ePu241" 
+              :min="0" 
+              align="left"
+              :controls="false"
+              style="width: 100%"
+            >
+          </el-input-number>
+        </el-form-item>
+        <el-form-item label="PU-242占比" style="width: 100%;" >
+          <el-input-number 
+              placeholder="请输入长度"
+              v-model="info.ePu242" 
+              :min="0" 
+              align="left"
+              :controls="false"
+              style="width: 100%"
+            >
+          </el-input-number>
+        </el-form-item>
+
+
         <el-form-item label="同位素丰度" style="width: 100%;">
           <el-input v-model="info.isotopicAbundance" style="width: 100%" placeholder="请输入同位素丰度"
           @input="handleNumberInput('isotopicAbundance')">

business-css/frontend/src/views/business/database/device/index.vue

@@ -7,7 +7,7 @@ export default {
 <script setup lang="ts">
 import { onMounted, ref, nextTick } from "vue";
 import { ElForm, ElMessage, ElMessageBox } from "element-plus";
-import { searchDevicesPage,addDevices,updateDevices,deleteDevices,deleteBatchDevices} from "@/api/business/database/device";
+import { searchDevicesPage,addDevices,updateDevices,deleteDevices,deleteBatchDevices,sizeSchemaAll} from "@/api/business/database/device";
 import { getDictItemById } from '@/api/dict';
 import Page from '@/components/Pagination/page.vue'
 import { getToken } from '@/utils/auth'
@@ -24,6 +24,20 @@ const total = ref()
 
 const tableData: any = ref([]);
 const multipleSelection = ref([]);
+
+//获取所有项目列表
+const sizeSchemaInfo:any = ref({});
+
+async function getSizeSchemaList(){
+  let result = await sizeSchemaAll({})
+  sizeSchemaInfo.value = result
+}
+
+
+
+
+
+
 // 表格加载
 const loading = ref(false)
 function gettableData() {
@@ -36,57 +50,7 @@ function gettableData() {
   loading.value = true;
   searchDevicesPage(params).then((result:any) => {
     result.records.forEach((item:any) => {
-      if(queryParams.value.type == 'FlatTank'){ // 扁平槽
+      item.size = JSON.parse(item.size)
-        let sizeInfo =JSON.parse(item.size)
-        item['length'] = sizeInfo.length
-        item['width'] = sizeInfo.width
-        item['height'] = sizeInfo.height
-      }
-      if(queryParams.value.type == 'CylindricalTank'){ // 圆柱槽
-        let sizeInfo =JSON.parse(item.size)
-        item['diameter'] = sizeInfo.diameter
-        item['height'] = sizeInfo.height
-      }
-      if(queryParams.value.type == 'AnnularTank'){ // 环形槽
-        let sizeInfo =JSON.parse(item.size)
-        item['outer_diameter'] = sizeInfo.outer_diameter
-        item['height'] = sizeInfo.height
-      }
-
-      if(queryParams.value.type == 'TubeBundleTank'){ // 管束槽
-        let sizeInfo =JSON.parse(item.size)
-        item['outer_diameter'] = sizeInfo.outer_diameter
-        item['height'] = sizeInfo.height
-      }
-       if(queryParams.value.type == 'ExtractionColumn'){ // 萃取柱
-        let sizeInfo =JSON.parse(item.size)
-        item['upper_expanded_diameter'] = sizeInfo.upper_expanded.diameter
-        item['upper_expanded_height'] = sizeInfo.upper_expanded.height
-        item['tray_section_diameter'] = sizeInfo.tray_section.diameter
-        item['tray_section_height'] = sizeInfo.tray_section.height
-        item['lower_expanded_diameter'] = sizeInfo.lower_expanded.diameter
-        item['lower_expanded_height'] = sizeInfo.lower_expanded.height
-
-      }
-
-      if(queryParams.value.type == 'FluidizedBed'){ // 流化床
-        let sizeInfo =JSON.parse(item.size)
-        item['expanded_section_diameter'] = sizeInfo.expanded_section.diameter
-        item['expanded_section_height'] = sizeInfo.expanded_section.height
-
-        item['transition_section_height'] = sizeInfo.transition_section.height
-
-
-        item['reaction_section_diameter'] = sizeInfo.reaction_section.diameter
-        item['reaction_section_height'] = sizeInfo.reaction_section.height
-      }
-      if(queryParams.value.type == 'ACFTank'){ // 锥底环形槽
-        let sizeInfo =JSON.parse(item.size)
-        item['annular_cylinder_outer_diameter'] = sizeInfo.annular_cylinder.outer_diameter
-        item['annular_cylinder_height'] = sizeInfo.annular_cylinder.height
-        item['frustum_bottom_bottom_diameter'] = sizeInfo.frustum_bottom.bottom_diameter
-        item['frustum_bottom_height'] = sizeInfo.frustum_bottom.height
-      }
 
     })
 
@@ -119,6 +83,7 @@ function menuInit() {
   getDictItemById(params).then((result: any) => {
     menuData.value = result.data.records;
     queryParams.value.type = menuData.value[0].itemCode
+    sourceTempData.value = sizeSchemaInfo.value[queryParams.value.type].fields
     gettableData();
   }).catch((err: any) => {
   });
@@ -126,6 +91,7 @@ function menuInit() {
 
 function handleMenu(row:any) {
    queryParams.value.type = row.itemCode
+    sourceTempData.value = sizeSchemaInfo.value[queryParams.value.type].fields
    gettableData()
 }
 
@@ -145,36 +111,46 @@ const info: any = ref({
 });
 
 const dialogVisible = ref(false);
+const sourceTempData:any = ref([])
 function addClick() {
   title.value = "新增设备";
   info.value = {
     name: "",
     code: "",
     type: queryParams.value.type,
-    size: null,
+    size: {},
     volume: null,
     flowRate: null,
     pulseVelocity: null
   };
-  josnInfo.value = {}
+
-  if(queryParams.value.type == 'ExtractionColumn'){
+  sourceTempData.value = sizeSchemaInfo.value[queryParams.value.type].fields
-    josnInfo.value = {
+
-      tray_section:{},
+  sourceTempData.value.forEach((item:any) => {
-      lower_expanded:{},
+    info.value.size[item.key] = null
-      upper_expanded:{}
+  })
-    }
+
-  }else if(queryParams.value.type == 'FluidizedBed'){
+
-    josnInfo.value = {
+
-      expanded_section:{},
+  // josnInfo.value = {}
-      reaction_section:{},
+  // if(queryParams.value.type == 'ExtractionColumn'){
-      transition_section:{}
+  //   josnInfo.value = {
-    }
+  //     tray_section:{},
-  }else if(queryParams.value.type == 'ACFTank'){
+  //     lower_expanded:{},
-    josnInfo.value = {
+  //     upper_expanded:{}
-      frustum_bottom:{},
+  //   }
-      annular_cylinder:{}
+  // }else if(queryParams.value.type == 'FluidizedBed'){
-    }
+  //   josnInfo.value = {
-  }
+  //     expanded_section:{},
+  //     reaction_section:{},
+  //     transition_section:{}
+  //   }
+  // }else if(queryParams.value.type == 'ACFTank'){
+  //   josnInfo.value = {
+  //     frustum_bottom:{},
+  //     annular_cylinder:{}
+  //   }
+  // }
   dialogVisible.value = true;
 
 }
@@ -188,7 +164,7 @@ function confirmClick(formEl: any) {
         const params = {
           projectId: -1,
           ...info.value,
-          size: JSON.stringify( josnInfo.value),
+          size: JSON.stringify( info.value.size)
         }
         addDevices(params).then((res) => {
           gettableData();
@@ -198,7 +174,7 @@ function confirmClick(formEl: any) {
         const params = {
             projectId: -1,
             ...info.value,
-            size: JSON.stringify( josnInfo.value)
+            size: JSON.stringify( info.value.size)
           }
         updateDevices(params).then((res) => {
           gettableData();
@@ -225,9 +201,12 @@ const rules = ref({
 function editClick(row: any) {
   title.value = "修改设备";
   info.value = JSON.parse(JSON.stringify(row));
-
+  sourceTempData.value = sizeSchemaInfo.value[queryParams.value.type].fields
-  if(row.size != null){
+  if(row.size == null || "object" != typeof row.size){
-    josnInfo.value = JSON.parse(row.size);
+    info.value.size = {}
+    sourceTempData.value.forEach((item:any) => {
+      info.value.size[item.key] = null
+    })
   }
   dialogVisible.value = true;
 }
@@ -326,6 +305,7 @@ function handleError(file: any){
 }
 const josnInfo:any = ref({})
 onMounted(() => {
+  getSizeSchemaList()
   menuInit()
 });
 
@@ -395,56 +375,15 @@ const handleInput = (val: string) => {
         <el-table-column type="index" label="序号" width="70" align="center"></el-table-column>
         <el-table-column prop="name" label="设备名称" min-width="180"></el-table-column>
 
-        <el-table-column v-if="queryParams.type == 'FlatTank'" prop="length" label="长度(cm)" min-width="100"></el-table-column>
+        <el-table-column   v-for="(item,index) in sourceTempData"   :label="item.label" min-width="100">
-        <el-table-column v-if="queryParams.type == 'FlatTank'" prop="width" label="宽度(cm)" min-width="100"></el-table-column>
+          <template #default="scope">
-        <el-table-column v-if="queryParams.type == 'FlatTank'" prop="height" label="高度(cm)" min-width="100"></el-table-column>
+            {{ scope.row.size[item.key] }}
-
+          </template>
-
+        </el-table-column>
-        <el-table-column v-if="queryParams.type == 'CylindricalTank'" prop="diameter" label="直径(cm)" min-width="100"></el-table-column>
-        <el-table-column v-if="queryParams.type == 'CylindricalTank'" prop="height" label="高度(cm)" min-width="100"></el-table-column>
-
-
-        <el-table-column v-if="queryParams.type == 'AnnularTank'" prop="outer_diameter" label="环形槽外径(cm)" min-width="100"></el-table-column>
-        <el-table-column v-if="queryParams.type == 'AnnularTank'" prop="height" label="环形槽高度(cm)" min-width="100"></el-table-column>
-
-
-
-        <el-table-column v-if="queryParams.type == 'TubeBundleTank'" prop="outer_diameter" label="外径(cm)" min-width="100"></el-table-column>
-        <el-table-column v-if="queryParams.type == 'TubeBundleTank'" prop="height" label="高度(cm)" min-width="100"></el-table-column>
-  
-
-
-        <el-table-column v-if="queryParams.type == 'ExtractionColumn'" prop="upper_expanded_diameter" label="上扩大段直径(cm)" min-width="100"></el-table-column>
-        <el-table-column v-if="queryParams.type == 'ExtractionColumn'" prop="upper_expanded_height" label="上扩大段高度(cm)" min-width="100"></el-table-column>
-        <el-table-column v-if="queryParams.type == 'ExtractionColumn'" prop="tray_section_diameter" label="板段直径(cm)" min-width="100"></el-table-column>
-        <el-table-column v-if="queryParams.type == 'ExtractionColumn'" prop="tray_section_height" label="板段高度(cm)" min-width="100"></el-table-column>
-        <el-table-column v-if="queryParams.type == 'ExtractionColumn'" prop="lower_expanded_diameter" label="下扩大段直径(cm)" min-width="100"></el-table-column>
-        <el-table-column v-if="queryParams.type == 'ExtractionColumn'" prop="lower_expanded_height" label="下扩大段高度(cm)" min-width="100"></el-table-column>
-
-
-
-        <el-table-column v-if="queryParams.type == 'FluidizedBed'" prop="expanded_section_diameter" label="扩大段直径(cm)" min-width="100"></el-table-column>
-        <el-table-column v-if="queryParams.type == 'FluidizedBed'" prop="expanded_section_height" label="扩大段高度(cm)" min-width="100"></el-table-column>
-        <el-table-column v-if="queryParams.type == 'FluidizedBed'" prop="transition_section_height" label="过渡段高度(cm)" min-width="100"></el-table-column>
-        <el-table-column v-if="queryParams.type == 'FluidizedBed'" prop="reaction_section_diameter" label="反应段直径(cm)" min-width="100"></el-table-column>
-        <el-table-column v-if="queryParams.type == 'FluidizedBed'" prop="reaction_section_height" label="反应段高度(cm)" min-width="100"></el-table-column>
-
-
-        <el-table-column v-if="queryParams.type == 'ACFTank'" prop="annular_cylinder_outer_diameter" label="环形圆柱外径(cm)" min-width="100"></el-table-column>
-        <el-table-column v-if="queryParams.type == 'ACFTank'" prop="annular_cylinder_height" label="环形圆柱高度(cm)" min-width="100"></el-table-column>
-        <el-table-column v-if="queryParams.type == 'ACFTank'" prop="frustum_bottom_bottom_diameter" label="圆锥台底部直径(cm)" min-width="100"></el-table-column>
-        <el-table-column v-if="queryParams.type == 'ACFTank'" prop="frustum_bottom_height" label="圆锥台底部高度(cm)" min-width="100"></el-table-column>
-
-
-
-
 
         <el-table-column prop="volume" label="容量(L)" width="120"></el-table-column>
         <el-table-column prop="flowRate" label="流量(m³/h)" width="120"></el-table-column>
         <el-table-column prop="pulseVelocity" label="脉冲速度(Hz)" width="120"></el-table-column>
-
-
-
         <el-table-column prop="modifier" label="创建人" width="120"></el-table-column>
         <el-table-column prop="createdAt" label="创建时间" width="200">
           <template #default="scope">
@@ -469,343 +408,30 @@ const handleInput = (val: string) => {
 
     <el-dialog v-model="dialogVisible" :close-on-click-modal="false"
     :modal="false" draggable :before-close="handleClose" :title="title"
-      append-to-body width="677px" height="530px">
+      append-to-body width="677px">
       
-      <el-form ref="infoForm" :model="info" :rules="rules" label-width="120px" v-if="dialogVisible == true">
+      <el-form ref="infoForm" :model="info" :rules="rules" label-width="120px" v-if="dialogVisible == true"
+      style="max-height: calc(100vh - 120px);overflow: auto;">
         <el-form-item label="设备编号" prop="code" style="width: 100%;">
           <el-input v-model="info.code" style="width: 100%" placeholder="请输入设备编号"></el-input>
         </el-form-item>
         <el-form-item label="设备名称" prop="name" style="width: 100%;">
           <el-input v-model="info.name" style="width: 100%" placeholder="请输入设备名称"></el-input>
         </el-form-item>
-        <div v-if="queryParams.type == 'FlatTank'">
-          <el-form-item label="长度" style="width: 100%;">
-              <el-input-number 
-                placeholder="请输入长度"
-                v-model="josnInfo['length']" 
-                :min="0" 
-                align="left"
-                :controls="false"
-                style="width: 100%"
-              >
-              <template #suffix>cm</template>
-            </el-input-number>
-            </el-form-item>
-            <el-form-item label="宽度" style="width: 100%;">
-              <el-input-number 
-                placeholder="请输入宽度"
-                v-model="josnInfo.width" 
-                :min="0" 
-                align="left"
-                :controls="false"
-                style="width: 100%"
-              >
-              <template #suffix>cm</template>
-              </el-input-number>
-            </el-form-item>
-            <el-form-item label="高度" style="width: 100%;">
-              <el-input-number 
-                placeholder="请输入高度"
-                v-model="josnInfo.height" 
-                :min="0" 
-                align="left"
-                :controls="false"
-                style="width: 100%"
-              >
-              <template #suffix>cm</template>
-              </el-input-number>
-            </el-form-item>
-        </div>
 
-        <div v-if="queryParams.type == 'CylindricalTank'">
+        <el-form-item :label="item.label" style="width: 100%;" v-for="item in sourceTempData">
-            <el-form-item label="直径" style="width: 100%;">
+          <el-input-number 
-              <el-input-number 
+              placeholder="请输入长度"
-                placeholder="请输入直径"
+              v-model="info.size[item.key]" 
-                v-model="josnInfo.diameter" 
+              :min="0" 
-                :min="0" 
+              align="left"
-                align="left"
+              :controls="false"
-                :controls="false"
+              style="width: 100%"
-                style="width: 100%"
+            >
-              >
+            <template #suffix>{{item.unit}}</template>
-              <template #suffix>cm</template>
+          </el-input-number>
-              </el-input-number>
+        </el-form-item>
-            </el-form-item>
-            <el-form-item label="高度" style="width: 100%;">
-              <el-input-number 
-                placeholder="请输入高度"
-                v-model="josnInfo.height" 
-                :min="0" 
-                align="left"
-                :controls="false"
-                style="width: 100%"
-              >
-              <template #suffix>cm</template>
-              </el-input-number>
-            </el-form-item>
-        </div>
      
-        <div v-if="queryParams.type == 'AnnularTank'">
-            <el-form-item label="环形槽外径" style="width: 100%;">
-              <el-input-number 
-                placeholder="请输入直径"
-                v-model="josnInfo.outer_diameter" 
-                :min="0" 
-                align="left"
-                :controls="false"
-                style="width: 100%"
-              >
-                <template #suffix>cm</template>
-              </el-input-number>
-            </el-form-item>
-            <el-form-item label="环形槽高度" style="width: 100%;">
-              <el-input-number 
-                placeholder="请输入高度"
-                v-model="josnInfo.height" 
-                :min="0" 
-                align="left"
-                :controls="false"
-                style="width: 100%"
-              >
-              <template #suffix>cm</template>
-              </el-input-number>
-            </el-form-item>
-        </div>
-
-         <div v-if="queryParams.type == 'TubeBundleTank'">
-            <el-form-item label="外径" style="width: 100%;">
-              <el-input-number 
-                placeholder="请输入直径"
-                v-model="josnInfo.outer_diameter" 
-                :min="0" 
-                align="left"
-                :controls="false"
-                style="width: 100%"
-              >
-                <template #suffix>cm</template>
-              </el-input-number>
-            </el-form-item>
-            <el-form-item label="高度" style="width: 100%;">
-              <el-input-number 
-                placeholder="请输入高度"
-                v-model="josnInfo.height" 
-                :min="0" 
-                align="left"
-                :controls="false"
-                style="width: 100%"
-              >
-              <template #suffix>cm</template>
-              </el-input-number>
-            </el-form-item>
-        </div>
-        <div v-if="queryParams.type == 'ExtractionColumn'">
-          <div class="flex">
-            <el-form-item label="上扩大段直径" style="width: 100%;">
-              <el-input-number 
-                placeholder="请输入直径"
-                v-model="josnInfo.upper_expanded.diameter" 
-                :min="0" 
-                align="left"
-                :controls="false"
-                style="width: 100%"
-              >
-                <template #suffix>cm</template>
-              </el-input-number>
-            </el-form-item>
-            <el-form-item label="上扩大段高度" style="width: 100%;">
-              <el-input-number 
-                placeholder="请输入高度"
-                v-model="josnInfo.upper_expanded.height" 
-                :min="0" 
-                align="left"
-                :controls="false"
-                style="width: 100%"
-              >
-              <template #suffix>cm</template>
-              </el-input-number>
-            </el-form-item>
-          </div>
-          <div class="flex">
-            <el-form-item label="板段直径" style="width: 100%;">
-              <el-input-number 
-                placeholder="请输入直径"
-                v-model="josnInfo.tray_section.diameter" 
-                :min="0" 
-                align="left"
-                :controls="false"
-                style="width: 100%"
-              >
-                <template #suffix>cm</template>
-              </el-input-number>  
-            </el-form-item>
-            <el-form-item label="板段高度" style="width: 100%;">
-              <el-input-number 
-                placeholder="请输入高度"
-                v-model="josnInfo.tray_section.height" 
-                :min="0" 
-                align="left"
-                :controls="false"
-                style="width: 100%"
-              >
-              <template #suffix>cm</template>
-              </el-input-number>
-            </el-form-item>
-          </div>
-           <div class="flex">
-            <el-form-item label="下扩大段直径" style="width: 100%;">
-              <el-input-number 
-                placeholder="请输入直径"
-                v-model="josnInfo.lower_expanded.diameter" 
-                :min="0" 
-                align="left"
-                :controls="false"
-                style="width: 100%"
-              >
-                <template #suffix>cm</template>
-              </el-input-number>
-            </el-form-item>
-         
-            <el-form-item label="下扩大段高度" style="width: 100%;">
-              <el-input-number 
-                placeholder="请输入高度"
-                v-model="josnInfo.lower_expanded.height" 
-                :min="0" 
-                align="left"
-                :controls="false"
-                style="width: 100%"
-              >
-              <template #suffix>cm</template>
-              </el-input-number>
-            </el-form-item>
-
-           </div>
-            
-        </div>
-
-        <div v-if="queryParams.type == 'FluidizedBed'">
-            <div class="flex">
-              <el-form-item label="扩大段直径" style="width: 100%;">
-                <el-input-number 
-                  placeholder="请输入直径"
-                  v-model="josnInfo.expanded_section.diameter" 
-                  :min="0" 
-                  align="left"
-                  :controls="false"
-                  style="width: 100%"
-                >
-                <template #suffix>cm</template>
-                </el-input-number>
-              </el-form-item>
-              <el-form-item label="扩大段高度" style="width: 100%;">
-                <el-input-number 
-                  placeholder="请输入高度"
-                  v-model="josnInfo.expanded_section.height" 
-                  :min="0" 
-                  align="left"
-                  :controls="false"
-                  style="width: 100%"
-                >
-                  <template #suffix>cm</template>
-                </el-input-number>      
-              </el-form-item>
-            </div>
-           
-            <el-form-item label="过渡段高度" style="width: 100%;">
-              <el-input-number 
-                placeholder="请输入高度"
-                v-model="josnInfo.transition_section.height" 
-                :min="0" 
-                align="left"
-                :controls="false"
-                style="width: 100%"
-              >
-                <template #suffix>cm</template>
-              </el-input-number>
-            </el-form-item>
-            <div class="flex">
-              <el-form-item label="反应段直径" style="width: 100%;">
-                <el-input-number 
-                  placeholder="请输入直径"
-                  v-model="josnInfo.reaction_section.diameter" 
-                  :min="0" 
-                  align="left"
-                  :controls="false"
-                  style="width: 100%"
-                >
-                  <template #suffix>cm</template>
-                </el-input-number>
-              </el-form-item>
-              <el-form-item label="反应段高度" style="width: 100%;">
-                <el-input-number 
-                  placeholder="请输入高度"
-                  v-model="josnInfo.reaction_section.height" 
-                  :min="0" 
-                  align="left"
-                  :controls="false"
-                  style="width: 100%"
-                >
-                  <template #suffix>cm</template>
-                </el-input-number>    
-              </el-form-item>
-            </div>
-            
-
-            
-        </div>
-    
-        <div v-if="queryParams.type == 'ACFTank'">
-          <div class="flex">
-            <el-form-item label="环形圆柱外径" style="width: 100%;">
-              <el-input-number 
-                placeholder="请输入外径"
-                v-model="josnInfo.annular_cylinder.outer_diameter" 
-                :min="0" 
-                align="left"
-                :controls="false"
-                style="width: 100%"
-              >
-                <template #suffix>cm</template>
-              </el-input-number>
-            </el-form-item>
-            <el-form-item label="环形圆柱高度" style="width: 100%;">
-              <el-input-number 
-                placeholder="请输入高度"
-                v-model="josnInfo.annular_cylinder.height" 
-                :min="0" 
-                align="left"
-                :controls="false"
-                style="width: 100%"
-              >
-                <template #suffix>cm</template>
-              </el-input-number>    
-            </el-form-item>
-          </div>
-          <div class="flex">
-            <el-form-item label="圆锥台底部直径" style="width: 100%;">
-              <el-input-number 
-                placeholder="请输入直径"
-                v-model="josnInfo.frustum_bottom.bottom_diameter" 
-                :min="0" 
-                align="left"
-                :controls="false"
-                style="width: 100%"
-              >
-                <template #suffix>cm</template>
-              </el-input-number>  
-            </el-form-item>
-            <el-form-item label="圆锥台底部高度" style="width: 100%;">
-              <el-input-number 
-                placeholder="请输入高度"
-                v-model="josnInfo.frustum_bottom.height" 
-                :min="0" 
-                align="left"
-                :controls="false"
-                style="width: 100%"
-              >
-                <template #suffix>cm</template>
-              </el-input-number>    
-            </el-form-item>
-          </div>
-        </div>
         <el-form-item label="容量" style="width: 100%;">
           <el-input-number 
             placeholder="请输入容量"
@@ -924,6 +550,7 @@ const handleInput = (val: string) => {
   padding: 0 !important;
   border-radius: 10px !important;
   border: 1px solid #363636 !important;
+  margin-top: 20px !important;
 }
 .el-dialog  .el-dialog__header{
   display: flex;
@@ -967,5 +594,4 @@ const handleInput = (val: string) => {
   border: none !important;
 }
 
-
 </style>