From 129afbc8dc3c5ac61cbdc1acf916c9d8fc18b8cd Mon Sep 17 00:00:00 2001
From: limengnan <420004014@qq.com>
Date: Fri, 16 Jan 2026 10:12:14 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=88=86=E6=9E=90=E5=9B=BE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../frontend/src/assets/x6/navleft.png        | Bin 0 -> 534 bytes
 .../frontend/src/assets/x6/navleft_active.png | Bin 0 -> 541 bytes
 .../frontend/src/assets/x6/navright.png       | Bin 0 -> 723 bytes
 .../src/assets/x6/navright_active.png         | Bin 0 -> 702 bytes
 .../src/components/antvx6/adddevice.vue       | 518 ++++++++++++++++++
 .../frontend/src/components/antvx6/index.vue  |  54 +-
 .../views/business/database/device/index.vue  | 107 ++++
 7 files changed, 677 insertions(+), 2 deletions(-)
 create mode 100644 business-css/frontend/src/assets/x6/navleft.png
 create mode 100644 business-css/frontend/src/assets/x6/navleft_active.png
 create mode 100644 business-css/frontend/src/assets/x6/navright.png
 create mode 100644 business-css/frontend/src/assets/x6/navright_active.png
 create mode 100644 business-css/frontend/src/components/antvx6/adddevice.vue

diff --git a/business-css/frontend/src/assets/x6/navleft.png b/business-css/frontend/src/assets/x6/navleft.png
new file mode 100644
index 0000000000000000000000000000000000000000..6270b712f42a9f70a47e8630980b5d0b8936b193
GIT binary patch
literal 534
zcmV+x0_pvUP)<h;3K|Lk000e1NJLTq003?P001Be1^@s6^9fDo00001b5ch_0Itp)
z=>Px#1ZP1_K>z@;j|==^1poj532;bRa{vGi!vFvd!vV){sAK>D0jo(wK~!i%?b@+U
z0znW4U~gHHE6Cjy6c(6J_yCj?7L*iPNnxUi_#hU>!rC|R5h#5CJDV%)tw~6Zz*T4t
zXV*Cr^bR|jN&YW^ow@eU?%uKl2W&o{9~)!t*X#8l2!ca?4F4mi&r4Ahk4cg|e?QvI
z2gjkkQkl3O_J=0UO&rHh+}1Mwi)I=P2u+3u9(VG=kv@;GXKtIC&1M~LYn8!uc?1Eh
zwI^KGDuV+-XzRM<vKE39h+a^Je=U~?P9WOnY_r)Maa#$&2}R*ub6E+&$<@oUtjF~)
z2u`p@qftBS5S(E2l5#~K%k35fCm8K>?Zsj-<aP^!6OPVwmCGf96Rs$VQ<`;cZZ{B|
zaI{>86y6258wgH;s-M6RoDO|=XUesQ;FS1zrbBQ_(0OjmrHA13=q#7Z0oMpl6Pk6K
z<r2Z^GMY}OEmt5oU0Pun`g=N)=Q;jEsYrQG7i3x1rB}^&{}fbMtyV`^DiyNUjuD(f
z#+dWKUDVO};Deum5{5RrPYUmid(a{EOC^PO>s!#`&IcDo(S&B*8I`H)L9Eo}6h+bG
Y3y{)mFSq51>i_@%07*qoM6N<$f|^6*(*OVf

literal 0
HcmV?d00001

diff --git a/business-css/frontend/src/assets/x6/navleft_active.png b/business-css/frontend/src/assets/x6/navleft_active.png
new file mode 100644
index 0000000000000000000000000000000000000000..7ff35502de56f06f0422a226a111a98cefb896a6
GIT binary patch
literal 541
zcmV+&0^<FNP)<h;3K|Lk000e1NJLTq003?P001Be1^@s6^9fDo00001b5ch_0Itp)
z=>Px#1ZP1_K>z@;j|==^1poj532;bRa{vGi!vFvd!vV){sAK>D0kTO%K~!i%?b|;~
zLSYog@$<VHG&ndoI2Z_NK{Plz1UWj?R6|gZtwBib5z)|m=?(M}9D4z6EkT<NEj72a
zmG|`A<3W<{wJo0q&S%i)JdR)PAFc{g%cn`BkkAzqbwH@<w)qE4{Ndj2kx)FmiSEX`
zvq?CKHlhat%Cc+b#vM3E&oORw%oU|C>5*p9e8Jbcm`TDhQ(Go8cj;xSagx+@%q8If
z)MYYW0BA#(xg?zNiwn1}%Ul-DL+;Ym{p)mT;XLFnUBxJ(T^%!7IA1Xx>ME0k^A*r)
z_PM3gFBZ;c%(+LMh4b6N<^>mZJ;lO#%-y6^-rl*Z;}i?$xd_=eDHhIuTPtT=(e;Fd
z^BxxYi}!Sxuy6s$dIV<Sf`E4Vov9AO!Udu*n!ZV~aG?P8bR{fYFi>0Vb4LdY7ZU#Q
z2+YC-gh9J&$6QL+7A_zlls*^6-_u2|p#6q2Akfn#+y$@BL@%;yf{-M<WT(miA)=mz
z3lNxgqH395bvB^@TJqn4W<PmycP#6&Y5d3hD5pvn?OZlY7=TL&H;gezn77lC@`3S_
f>yvgG#u$79o>^iwb<<3T00000NkvXXu0mjf0NL${

literal 0
HcmV?d00001

diff --git a/business-css/frontend/src/assets/x6/navright.png b/business-css/frontend/src/assets/x6/navright.png
new file mode 100644
index 0000000000000000000000000000000000000000..706c92455b45b504a8cb6a982bd2aac1a81c281d
GIT binary patch
literal 723
zcmV;^0xbQBP)<h;3K|Lk000e1NJLTq003?P001Be1^@s6^9fDo00001b5ch_0Itp)
z=>Px#1ZP1_K>z@;j|==^1poj532;bRa{vGi!vFvd!vV){sAK>D0%%D@K~!i%?V7)8
z+&~b<t-U=^A@(FVI2U#iNFE?viWDx>xQdHF0(KrGg>jKOZ;(I&DH3p*GKIS|E>fll
zBoH4yxZ_TRxj#C8vl<_fPm-^ar<fmzof)?K_-1w`1zTV=8a*_|oGh2iy&wp-sirha
zisvlLvUhPDf6Ght1T5MQ#Bp9y?h}~jb*IyL&uJyl%$#6V(d6)!*IEpoCwZtyfJW6|
zFxcU=5)$qr4;3j`YoBshiNQep#IYg-jIWm*RuT+{!x$U?!J;A8lzRpTl=*Bnd(iE6
z|8i*!lO)Lq>qbXVr5Ru%+itfHI4y-{9BusIGer#0<dDNs`~@7=wBzxZ+GW>Q6%i~J
zi^u4Q=bRR}aoilwM_*CI&}y|RUFU@(psuz{VW1PfqHf4(ft7G%No@MbsUiRxT^M1{
zI4!Uej#1YM16Q@ucIgi%H>7F0jh6WbN|)MGX&!XJE9kN7oEvb-Q*c}qMHkqlcRE2p
zk1)%!7o4uR-72^A6_`BAUV#-_B>`)OlgZ=~VU$-C3BXW~;yC`r>AK@!%`1ranNvjw
zx9@ao!VwTpPnW`gnT|O0lnRFv%o&#7d8P<q2P15c<8t8$D6Fm%1~gf<%Sz!e4DbA5
zMQNOae!uSzjg`VBNkXmid!8vmh{7=R-{~raBeY%00|!UnF4yjH|3kKf!k2V==aM3T
z>2$hV>$qO8mqN5JoGL=F)*jUg$9&~g5rQ%1d2OpCFy}1p4>L{`A>8RWw8}Ze(+{k&
zINzjIl6Y@8RAg|xk#NqrQ@Cy)Vd)=7N@LLPCHu~~(`)4XvDlG!L`DDr002ovPDHLk
FV1g^%J`Ml?

literal 0
HcmV?d00001

diff --git a/business-css/frontend/src/assets/x6/navright_active.png b/business-css/frontend/src/assets/x6/navright_active.png
new file mode 100644
index 0000000000000000000000000000000000000000..eb945fcbd59d1af589bcf2351161bca6815864e9
GIT binary patch
literal 702
zcmV;v0zv(WP)<h;3K|Lk000e1NJLTq003?P001Be1^@s6^9fDo00001b5ch_0Itp)
z=>Px#1ZP1_K>z@;j|==^1poj532;bRa{vGi!vFvd!vV){sAK>D0#ivuK~!i%?b<PD
z6j2Zc;Q3#2kRnBj6bi92Q4otOQwXL^p_M5F1!F77p}k13uwI4K1|nD}Tw!6Ukj^Hc
z1iUm!Ap{guNFniV$9eC@ljU~zQr%54Uy+;HY;`~L_U+z+#Q6vL;#5vgm}murGx3-k
zA0|GQj~(Qcb)JWJ{iF4eLhI2-0_OCXn;;pUyZaelXj>`7N%PPw;ip>E3e2>uwKE`I
zsuu6(3))r+03B)VjF3#OXjv&v+)J&U5fa=jEh~i+U|ZJJ-`YC^WSCY*Etlai!%sQ!
zR9jFt9ss68pfznvh4@EK+)ACZgXxY|rBZNb=jbgne@{o84M20L#ZB#oq~JbmperA8
zt#hU@S593DF7f5kqT5#=^R(6lgW&cv>@x9ZZJhzK_n80sgIBdJ_&;$`PCj+U1e9-5
z3c)pc*p^L7yxuuGu3dP@^I8uSg4^4~k=(WWJ)J3-;V$3QW}vuK3V#G<PuU}|q2Nw_
zp{+mcIWw>ve>c@884B)j3-P(-tA6LKnCcZbDMP_UV85p`2ehtLQW{+68FplMd7!N`
z0SgyfyrNBcaEU)jF-L}Juv}IKC;u4v!ipO&2CZGX$Fs4n4DL&Y1Bv*(w$1<$X8$z$
zztdGOm4bb_GzYp|rWazX#Ifu)_?w(IqlcUUdCuo*CvI;O$4vBETW16Ut=9$@$-4SR
zOJ@X_Zj1~rzSf|nvjS+=UgQ2*YUQ6~@-A!ZCXIP_<itf1+9NHU1;ECsg6m{x=gik*
k(t5~Ef_(omhfap}UoC>AaU*8*asU7T07*qoM6N<$f`O|!TL1t6

literal 0
HcmV?d00001

diff --git a/business-css/frontend/src/components/antvx6/adddevice.vue b/business-css/frontend/src/components/antvx6/adddevice.vue
new file mode 100644
index 0000000..44dea33
--- /dev/null
+++ b/business-css/frontend/src/components/antvx6/adddevice.vue
@@ -0,0 +1,518 @@
+<script lang="ts">
+export default {
+  name: "添加设备",
+};
+</script>
+
+<script setup lang="ts">
+import { onMounted, ref, nextTick } from "vue";
+import { ElForm, ElMessage, ElMessageBox } from "element-plus";
+import { searchDevicesPage,addDevices } from "@/api/business/database/device";
+const emit = defineEmits([ 'closeAdddevice']);
+
+const props = defineProps({
+  projectInfo: {
+    required: false,
+    type: Object,
+    default: {}
+  },
+  deviceId: {
+    required: false,
+    type: String,
+    default: ''
+  },
+  deviceTypetype: {
+    required: false,
+    type: String,
+    default: ''
+  },
+})
+const input = ref('') // 设备名称
+const loading = ref(false) // 加载中
+const tableData = ref([]) // 表格数据
+const deviceTypetype:any = ref(props.deviceTypetype) //
+function gettableData() {
+let params = {
+  name: input.value,
+  type: props.deviceTypetype,
+  pageNum: 1,
+  pageSize: 999,
+};
+if(deviceTypetype.value == ''){
+  return
+}
+loading.value = true;
+searchDevicesPage(params).then((result:any) => {
+  result.records.forEach((item:any) => {
+    if(deviceTypetype.value == 'FlatTank'){ // 扁平槽
+      let sizeInfo =JSON.parse(item.size)
+      item['length'] = sizeInfo.length
+      item['width'] = sizeInfo.width
+      item['height'] = sizeInfo.height
+    }
+    if(deviceTypetype.value == 'CylindricalTank'){ // 圆柱槽
+      let sizeInfo =JSON.parse(item.size)
+      item['diameter'] = sizeInfo.diameter
+      item['height'] = sizeInfo.height
+    }
+    if(deviceTypetype.value == 'AnnularTank'){ // 环形槽
+      let sizeInfo =JSON.parse(item.size)
+      item['outer_diameter'] = sizeInfo.outer_diameter
+      item['height'] = sizeInfo.height
+    }
+
+    if(deviceTypetype.value == 'TubeBundleTank'){ // 管束槽
+      let sizeInfo =JSON.parse(item.size)
+      item['outer_diameter'] = sizeInfo.outer_diameter
+      item['height'] = sizeInfo.height
+    }
+      if(deviceTypetype.value == '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(deviceTypetype.value == '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(deviceTypetype.value == '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
+    }
+
+  })
+  tableData.value = result.records;
+  loading.value = false;
+}).catch((err) => {
+  loading.value = false;
+});
+}
+const selectedDevice:any = ref({}) // 选中患者
+const selectPatient = (row:any) => { // 选择患者
+  selectedDevice.value = row
+  console.log(selectedDevice.value)
+}
+function confirmDevice(){ // 确定添加设备
+  const params = {
+    projectId: props.projectInfo.projectId,
+    deviceId: selectedDevice.value.deviceId,
+    size: selectedDevice.value.size,
+    code: selectedDevice.value.code,
+    name: selectedDevice.value.name,
+    type: selectedDevice.value.type,
+    volume: selectedDevice.value.volume,
+    flowRate: selectedDevice.value.flowRate,
+    pulseVelocity: selectedDevice.value.pulseVelocity,
+  }
+  addDevices(params).then((res) => {
+    emit('closeAdddevice', selectedDevice.value)
+  });
+}
+
+function confirmClick(formEl: any) {
+  formEl.validate((valid: any) => {
+    if (valid) {
+      const params = {
+        ...info.value,
+        size: JSON.stringify( josnInfo.value),
+        projectId: props.projectInfo.projectId,
+        deviceId: selectedDevice.value.deviceId
+      }
+      addDevices(params).then((res) => {
+        emit('closeAdddevice', selectedDevice.value)
+      });
+    }
+  });
+}
+
+onMounted(() => {
+  gettableData()
+
+});
+const infoForm = ref();
+const isAdd = ref(false) // 是否添加设备 
+const info: any = ref({
+  name: "",
+  code: "",
+  type: null,
+  size: null,
+  volume: null,
+  flowRate: null,
+  pulseVelocity: null
+});
+const josnInfo: any = ref({}) // 设备信息
+const rules = ref({
+  name: [{ required: true, message: "请输入设备名称", trigger: "blur" }],
+  code: [{ required: true, message: "请输入设备编码", trigger: "blur" }],
+});
+function addClick() {
+  info.value = {
+    name: "",
+    code: "",
+    type: props.deviceTypetype,
+    size: null,
+    volume: null,
+    flowRate: null,
+    pulseVelocity: null
+  };
+  josnInfo.value = {}
+  if(props.deviceTypetype == 'ExtractionColumn'){
+    josnInfo.value = {
+      tray_section:{},
+      lower_expanded:{},
+      upper_expanded:{}
+    }
+  }else if(props.deviceTypetype == 'FluidizedBed'){
+    josnInfo.value = {
+      expanded_section:{},
+      reaction_section:{},
+      transition_section:{}
+    }
+  }else if(props.deviceTypetype == 'ACFTank'){
+    josnInfo.value = {
+      frustum_bottom:{},
+      annular_cylinder:{}
+    }
+  }
+   isAdd.value = true
+}
+</script>
+
+<template>
+  <div class="adddevice-box">
+    <div style="display: flex; margin-bottom: 20px; border-bottom: 1px solid #e5e5e5;padding-bottom: 5px;">
+      <div @click="isAdd = false" class="adddevice_navigation_left" :class="{'adddevice_navigation_activeleft':!isAdd}">选择设备</div>
+      <div @click="addClick" class="adddevice_navigation_right" :class="{'adddevice_navigation_activeright':isAdd}">自定义</div>
+    </div>
+    <div v-if="isAdd == false">
+      <div style="display: flex; justify-content: space-between;margin-bottom: 10px;">
+        <div style="display: flex;display: -webkit-flex;">
+          <el-input v-model="input" placeholder="请输入设备名称" @keyup.enter="gettableData" style="width: 200px" clearable />
+          <el-button type="primary" style="margin-left: 10px" @click="gettableData">搜索</el-button>
+        </div>
+        <el-button type="primary" :disabled="!selectedDevice.name" @click="confirmDevice">确定</el-button>
+      </div>
+      <el-table v-loading="loading" :data="tableData" style="width: 100%; height: calc(100vh - 300px);margin-bottom: 10px;" border
+        @cell-click="selectPatient" highlight-current-row  row-key="id"  :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 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="deviceTypetype == 'FlatTank'" prop="length" label="长度(cm)" min-width="100"></el-table-column>
+        <el-table-column v-if="deviceTypetype == 'FlatTank'" prop="width" label="宽度(cm)" min-width="100"></el-table-column>
+        <el-table-column v-if="deviceTypetype == 'FlatTank'" prop="height" label="高度(cm)" min-width="100"></el-table-column>
+        <el-table-column v-if="deviceTypetype == 'CylindricalTank'" prop="diameter" label="直径(cm)" min-width="100"></el-table-column>
+        <el-table-column v-if="deviceTypetype == 'CylindricalTank'" prop="height" label="高度(cm)" min-width="100"></el-table-column>
+        <el-table-column v-if="deviceTypetype == 'AnnularTank'" prop="outer_diameter" label="环形槽外径(cm)" min-width="100"></el-table-column>
+        <el-table-column v-if="deviceTypetype == 'AnnularTank'" prop="height" label="环形槽高度(cm)" min-width="100"></el-table-column>
+        <el-table-column v-if="deviceTypetype == 'TubeBundleTank'" prop="outer_diameter" label="外径(cm)" min-width="100"></el-table-column>
+        <el-table-column v-if="deviceTypetype == 'TubeBundleTank'" prop="height" label="高度(cm)" min-width="100"></el-table-column>
+        <el-table-column v-if="deviceTypetype == 'ExtractionColumn'" prop="upper_expanded_diameter" label="上扩大段直径(cm)" min-width="100"></el-table-column>
+        <el-table-column v-if="deviceTypetype == 'ExtractionColumn'" prop="upper_expanded_height" label="上扩大段高度(cm)" min-width="100"></el-table-column>
+        <el-table-column v-if="deviceTypetype == 'ExtractionColumn'" prop="tray_section_diameter" label="板段直径(cm)" min-width="100"></el-table-column>
+        <el-table-column v-if="deviceTypetype == 'ExtractionColumn'" prop="tray_section_height" label="板段高度(cm)" min-width="100"></el-table-column>
+        <el-table-column v-if="deviceTypetype == 'ExtractionColumn'" prop="lower_expanded_diameter" label="下扩大段直径(cm)" min-width="100"></el-table-column>
+        <el-table-column v-if="deviceTypetype == 'ExtractionColumn'" prop="lower_expanded_height" label="下扩大段高度(cm)" min-width="100"></el-table-column>
+        <el-table-column v-if="deviceTypetype == 'FluidizedBed'" prop="expanded_section_diameter" label="扩大段直径(cm)" min-width="100"></el-table-column>
+        <el-table-column v-if="deviceTypetype == 'FluidizedBed'" prop="expanded_section_height" label="扩大段高度(cm)" min-width="100"></el-table-column>
+        <el-table-column v-if="deviceTypetype == 'FluidizedBed'" prop="transition_section_height" label="过渡段高度(cm)" min-width="100"></el-table-column>
+        <el-table-column v-if="deviceTypetype == 'FluidizedBed'" prop="reaction_section_diameter" label="反应段直径(cm)" min-width="100"></el-table-column>
+        <el-table-column v-if="deviceTypetype == 'FluidizedBed'" prop="reaction_section_height" label="反应段高度(cm)" min-width="100"></el-table-column>
+        <el-table-column v-if="deviceTypetype == 'ACFTank'" prop="annular_cylinder_outer_diameter" label="环形圆柱外径(cm)" min-width="100"></el-table-column>
+        <el-table-column v-if="deviceTypetype == 'ACFTank'" prop="annular_cylinder_height" label="环形圆柱高度(cm)" min-width="100"></el-table-column>
+        <el-table-column v-if="deviceTypetype == 'ACFTank'" prop="frustum_bottom_bottom_diameter" label="圆锥台底部直径(cm)" min-width="100"></el-table-column>
+        <el-table-column v-if="deviceTypetype == '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>
+    </div>
+    <div v-if="isAdd == true">
+      <el-form ref="infoForm" :model="info" :rules="rules" label-width="120px" v-if="isAdd == true" 
+       style="width: 100%;height: calc(100vh - 340px);margin-top: 30px;">
+        <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="deviceTypetype == 'FlatTank'">
+            <el-form-item label="长度" style="width: 100%;">
+              <el-input v-model="josnInfo['length']" style="width: 100%" placeholder="请输入长度">
+                <template #append>cm</template>
+              </el-input>
+            </el-form-item>
+            <el-form-item label="宽度" style="width: 100%;">
+              <el-input v-model="josnInfo.width" style="width: 100%" placeholder="请输入宽度">
+                <template #append>cm</template>
+              </el-input>
+            </el-form-item>
+            <el-form-item label="高度" style="width: 100%;">
+              <el-input v-model="josnInfo.height" style="width: 100%" placeholder="请输入高度">
+                <template #append>cm</template>
+              </el-input>
+            </el-form-item>
+        </div>
+
+        <div v-if="deviceTypetype == 'CylindricalTank'">
+            <el-form-item label="直径" style="width: 100%;">
+              <el-input v-model="josnInfo.diameter" style="width: 100%" placeholder="请输入直径">
+                <template #append>cm</template>
+              </el-input>
+            </el-form-item>
+            <el-form-item label="高度" style="width: 100%;">
+              <el-input v-model="josnInfo.height" style="width: 100%" placeholder="请输入高度">
+                <template #append>cm</template>
+              </el-input>
+            </el-form-item>
+        </div>
+
+        <div v-if="deviceTypetype == 'AnnularTank'">
+            <el-form-item label="环形槽外径" style="width: 100%;">
+              <el-input v-model="josnInfo.outer_diameter" style="width: 100%" placeholder="请输入直径">
+                <template #append>cm</template>
+              </el-input>
+            </el-form-item>
+            <el-form-item label="环形槽高度" style="width: 100%;">
+              <el-input v-model="josnInfo.height" style="width: 100%" placeholder="请输入高度">
+                <template #append>cm</template>
+              </el-input>
+            </el-form-item>
+        </div>
+
+         <div v-if="deviceTypetype == 'TubeBundleTank'">
+            <el-form-item label="外径" style="width: 100%;">
+              <el-input v-model="josnInfo.outer_diameter" style="width: 100%" placeholder="请输入直径">
+                <template #append>cm</template>
+              </el-input>
+            </el-form-item>
+            <el-form-item label="高度" style="width: 100%;">
+              <el-input v-model="josnInfo.height" style="width: 100%" placeholder="请输入高度">
+                <template #append>cm</template>
+              </el-input>
+            </el-form-item>
+        </div>
+        <div v-if="deviceTypetype == 'ExtractionColumn'">
+          <div class="flex">
+            <el-form-item label="上扩大段直径" style="width: 100%;">
+              <el-input v-model="josnInfo.upper_expanded.diameter" style="width: 100%" placeholder="请输入直径">
+                <template #append>cm</template>
+              </el-input>
+            </el-form-item>
+            <el-form-item label="上扩大段高度" style="width: 100%;">
+              <el-input v-model="josnInfo.upper_expanded.height" style="width: 100%" placeholder="请输入高度">
+                <template #append>cm</template>
+              </el-input>
+            </el-form-item>
+          </div>
+          <div class="flex">
+            <el-form-item label="板段直径" style="width: 100%;">
+              <el-input v-model="josnInfo.tray_section.diameter" style="width: 100%" placeholder="请输入直径">
+                <template #append>cm</template>
+              </el-input>
+            </el-form-item>
+            <el-form-item label="板段高度" style="width: 100%;">
+              <el-input v-model="josnInfo.tray_section.height" style="width: 100%" placeholder="请输入高度">
+                <template #append>cm</template>
+              </el-input>
+            </el-form-item>
+          </div>
+           <div class="flex">
+            <el-form-item label="下扩大段直径" style="width: 100%;">
+              <el-input v-model="josnInfo.lower_expanded.diameter" style="width: 100%" placeholder="请输入直径">
+                <template #append>cm</template>
+              </el-input>
+            </el-form-item>
+         
+            <el-form-item label="下扩大段高度" style="width: 100%;">
+              <el-input v-model="josnInfo.lower_expanded.height" style="width: 100%" placeholder="请输入高度">
+                <template #append>cm</template>
+              </el-input>
+            </el-form-item>
+
+           </div>
+            
+        </div>
+
+        <div v-if="deviceTypetype == 'FluidizedBed'">
+            <div class="flex">
+              <el-form-item label="扩大段直径" style="width: 100%;">
+                <el-input v-model="josnInfo.expanded_section.diameter" style="width: 100%" placeholder="请输入直径">
+                  <template #append>cm</template>
+                </el-input>
+              </el-form-item>
+              <el-form-item label="扩大段高度" style="width: 100%;">
+                <el-input v-model="josnInfo.expanded_section.height" style="width: 100%" placeholder="请输入高度">
+                  <template #append>cm</template>
+                </el-input>
+              </el-form-item>
+            </div>
+           
+            <el-form-item label="过渡段高度" style="width: 100%;">
+              <el-input v-model="josnInfo.transition_section.height" style="width: 100%" placeholder="请输入高度">
+                <template #append>cm</template>
+              </el-input>
+            </el-form-item>
+            <div class="flex">
+              <el-form-item label="反应段直径" style="width: 100%;">
+                <el-input v-model="josnInfo.reaction_section.diameter" style="width: 100%" placeholder="请输入直径">
+                  <template #append>cm</template>
+                </el-input>
+              </el-form-item>
+              <el-form-item label="反应段高度" style="width: 100%;">
+                <el-input v-model="josnInfo.reaction_section.height" style="width: 100%" placeholder="请输入高度">
+                  <template #append>cm</template>
+                </el-input>
+              </el-form-item>
+            </div>
+            
+
+            
+        </div>
+    
+        <div v-if="deviceTypetype == 'ACFTank'">
+          <div class="flex">
+            <el-form-item label="环形圆柱外径" style="width: 100%;">
+              <el-input v-model="josnInfo.annular_cylinder.outer_diameter" style="width: 100%" placeholder="请输入外径">
+                <template #append>cm</template>
+              </el-input>
+            </el-form-item>
+            <el-form-item label="环形圆柱高度" style="width: 100%;">
+              <el-input v-model="josnInfo.annular_cylinder.height" style="width: 100%" placeholder="请输入高度">
+                <template #append>cm</template>
+              </el-input>
+            </el-form-item>
+          </div>
+          <div class="flex">
+            <el-form-item label="圆锥台底部直径" style="width: 100%;">
+              <el-input v-model="josnInfo.frustum_bottom.bottom_diameter" style="width: 100%" placeholder="请输入直径">
+                <template #append>cm</template>
+              </el-input>
+            </el-form-item>
+            <el-form-item label="圆锥台底部高度" style="width: 100%;">
+              <el-input v-model="josnInfo.frustum_bottom.height" style="width: 100%" placeholder="请输入高度">
+                <template #append>cm</template>
+              </el-input>
+            </el-form-item>
+          </div>
+        </div>
+        <el-form-item label="容量" style="width: 100%;">
+          <el-input v-model="info.volume" style="width: 100%" placeholder="请输入容量">
+             <template #append>L</template>
+          </el-input>
+        </el-form-item>
+        <el-form-item label="流量"  style="width: 100%;">
+          <el-input v-model="info.flowRate" style="width: 100%" placeholder="请输入流量">
+             <template #append>m³/h</template>
+          </el-input>
+        </el-form-item>
+        <el-form-item label="脉冲速度" style="width: 100%;">
+          <el-input v-model="info.pulseVelocity" style="width: 100%" placeholder="请输入脉冲速度">
+             <template #append>Hz</template>
+          </el-input>
+        </el-form-item>
+        <!-- <span class="dialog-footer"
+          style="display: flex;display: -webkit-flex; justify-content: flex-end;-webkit-justify-content: flex-end;">
+          <el-button @click="handleClose">取 消</el-button>
+          <el-button type="primary" @click="confirmClick(infoForm)">确 定</el-button>
+        </span> -->
+      </el-form>
+      <div style="display: flex; justify-content: flex-end;">
+        <el-button type="primary" @click="confirmClick(infoForm)">确定</el-button>
+      </div>
+    </div>
+
+  </div>
+</template>
+
+<style scoped>
+.adddevice-box{
+  width: 100%;
+  height: calc(100vh - 200px);
+}
+.adddevice_navigation_left{
+  width: 110px;
+  height: 32px;
+  line-height: 32px;
+  text-align: center;
+  cursor: pointer;
+  font-family: 'Arial Normal', 'Arial';
+  font-weight: 400;
+  font-style: normal;
+  font-size: 14px;
+  color: #363636;
+  background-image: url('@/assets/x6/navleft.png');
+}
+.adddevice_navigation_left:hover{
+  color: #266fff ;
+}
+.adddevice_navigation_activeleft{
+  background-image: url('@/assets/x6/navleft_active.png');
+  color: #fff !important;
+}
+.adddevice_navigation_right{
+   width: 110px;
+  height: 32px;
+  line-height: 32px;
+  text-align: center;
+  cursor: pointer;
+  font-family: 'Arial Normal', 'Arial';
+  font-weight: 400;
+  font-style: normal;
+  font-size: 14px;
+  color: #363636;
+  background-image: url('@/assets/x6/navright.png');
+}
+.adddevice_navigation_right:hover{
+  color: #266fff ;
+}
+.adddevice_navigation_activeright{
+  background-image: url('@/assets/x6/navright_active.png');
+  color: #fff !important;
+}
+</style>
+<style>
+ .el-table .el-table--enable-row-hover .el-table__body tr:hover > td{
+  background-color: #194764 !important;
+}
+
+ .adddevice-box .el-table .el-table__row.current-row td{
+  background-color: #f3faff !important;
+  border-top:1px solid #14aaff;
+  border-bottom:1px solid #14aaff
+}
+.adddevice-box .el-table .el-table__row.current-row td:last-child{
+  border-right:1px solid #14aaff;
+}
+.adddevice-box .el-table .el-table__row.current-row td:first-child{
+  border-left:1px solid #14aaff;
+}
+.adddevice-box .el-table .el-table__row.current-row:last-child td{
+  border-bottom:1px solid #14aaff
+}
+.el-table__inner-wrapper:before{
+  background-color: transparent !important;
+  border-top: 1px solid var(--el-table-border-color);
+}
+ .el-table--border:before{
+  background-color: transparent !important;
+  border-top: 1px solid var(--el-table-border-color);
+}
+</style>
+
+
+
diff --git a/business-css/frontend/src/components/antvx6/index.vue b/business-css/frontend/src/components/antvx6/index.vue
index bf3e7ff..faf0bda 100644
--- a/business-css/frontend/src/components/antvx6/index.vue
+++ b/business-css/frontend/src/components/antvx6/index.vue
@@ -32,6 +32,9 @@ import line3 from '@/assets/x6/line3.png'
 import line4 from '@/assets/x6/line4.png'
 import line5 from '@/assets/x6/line5.png'
 import line6 from '@/assets/x6/line6.png'
+import AdddeviceModel from './adddevice.vue';
+
+
 const emit = defineEmits([ 'closeAntvx6']);
 const props = defineProps({
   projectInfo: {
@@ -40,6 +43,8 @@ const props = defineProps({
     default: {}
   },
 })
+const deviceTypetype:any = ref('') // 设备类型
+const isAdddevice = ref(false)
 const projectInfo:any = ref(props.projectInfo) // 项目信息
 const isScenario = ref(false) //是否展示历史模拟场景
 const isDisplay = ref(true) // 是否显示
@@ -282,6 +287,24 @@ onMounted(() => {
       if(node.store && node.store.data && node.store.data.shape === 'rect'){
         return
       }
+      nodeId.value = node.id
+      if(node.store.data.attrs.text.text == '扁平槽'){
+        deviceTypetype.value = 'FlatTank' 
+      }else if(node.store.data.attrs.text.text == '圆柱槽'){
+        deviceTypetype.value = 'CylindricalTank'
+      }else if(node.store.data.attrs.text.text == '环形槽'){
+        deviceTypetype.value = 'AnnularTank'
+      }else if(node.store.data.attrs.text.text == '管束槽'){
+        deviceTypetype.value = 'TubeBundleTank'
+      }else if(node.store.data.attrs.text.text == '萃取柱'){
+        deviceTypetype.value = 'ExtractionColumn'
+      }else if(node.store.data.attrs.text.text == '流化床'){
+        deviceTypetype.value = 'FluidizedBed'
+      }else if(node.store.data.attrs.text.text == '锥底环形槽'){
+        deviceTypetype.value = 'ACFTank'
+      }
+    
+   
       // 设置固定大小
       node.size(160, 160)
       // 去掉背景节点
@@ -294,6 +317,11 @@ onMounted(() => {
       // 删除节点上的文字
       node.attr('text/text', '')
       node.attr('label/text', '')
+
+
+      isAdddevice.value = true
+
+
     }
 
   })
@@ -565,8 +593,6 @@ graph.on('blank:mouseup', (e) => {
     true,
   )
 
-// stencil.load([r1, r2, r3, r4, r5, r6], 'group1')
-
   const imageShapes = [
     {
       label: '圆柱槽',
@@ -883,6 +909,11 @@ function bigClick(){
 function smallClick(){
   graph.zoom(-0.1)
 }
+
+const nodeId = ref("")
+
+
+
 function analysisAdd(){
    dialogVisible.value = true;
 }
@@ -897,6 +928,19 @@ function simulationClick() { // 打开模拟分析
 function handleClose() {
   isScenario.value = false;
 }
+
+function dialogAdddevice(){ // 打开新增设备弹窗
+   graph.undo()
+   isAdddevice.value = false;
+}
+const selectedDevice = ref({})
+function closeAdddevice(e:any){ // 关闭新增设备弹窗
+  selectedDevice.value = e
+  let retrievedNode:any = graph.getCellById(nodeId.value)
+  retrievedNode.store.data.deviceInfo = e
+  debugger
+  isAdddevice.value = false;
+}
 </script>
  
 <template>
@@ -987,6 +1031,12 @@ function handleClose() {
         append-to-body width="1142px">
       <ScenarioModel v-if="isScenario"  :projectInfo="projectInfo" ref="Scenario" />
     </el-dialog>
+    <el-dialog v-model="isAdddevice" :close-on-click-modal="false"
+      :modal="false" draggable :before-close="dialogAdddevice" title="添加设备"
+        append-to-body width="1050px">
+         <AdddeviceModel v-if="isAdddevice == true" :deviceId="nodeId" :projectInfo="projectInfo"
+          :deviceTypetype="deviceTypetype" ref="Adddevice" @closeAdddevice="closeAdddevice"/>
+    </el-dialog>
   </div>
 </template>
  
diff --git a/business-css/frontend/src/views/business/database/device/index.vue b/business-css/frontend/src/views/business/database/device/index.vue
index cf0827f..a531aba 100644
--- a/business-css/frontend/src/views/business/database/device/index.vue
+++ b/business-css/frontend/src/views/business/database/device/index.vue
@@ -35,6 +35,62 @@ function gettableData() {
   };
   loading.value = true;
   searchDevicesPage(params).then((result:any) => {
+    result.records.forEach((item:any) => {
+      if(queryParams.value.type == 'FlatTank'){ // 扁平槽
+        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
+      }
+
+    })
+
+
     tableData.value = result.records;
     total.value = result.total;
     loading.value = false;
@@ -319,6 +375,57 @@ onMounted(() => {
         <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="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-if="queryParams.type == 'FlatTank'" prop="width" label="宽度(cm)" min-width="100"></el-table-column>
+        <el-table-column v-if="queryParams.type == 'FlatTank'" prop="height" label="高度(cm)" min-width="100"></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="updatedAt" label="创建时间" width="200">
           <template #default="scope">