From 3f3851609075ee70570b1e2620ecc52a2ee906c6 Mon Sep 17 00:00:00 2001
From: trp <2477421791@qq.com>
Date: Mon, 19 Aug 2024 11:35:55 +0800
Subject: [PATCH 1/7] =?UTF-8?q?=E5=94=90=E6=B6=A6=E5=B9=B3=EF=BC=9A?=
 =?UTF-8?q?=E6=A8=A1=E5=9E=8B=E5=AE=9E=E9=99=85=E6=95=B0=E5=80=BC=E6=98=BE?=
 =?UTF-8?q?=E7=A4=BA=E5=92=8C=E6=8E=92=E7=89=88=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../tunnelScene/preEquComp/preDialog.vue      | 50 +++++++++++--------
 1 file changed, 30 insertions(+), 20 deletions(-)

diff --git a/src/components/content/tunnelScene/preEquComp/preDialog.vue b/src/components/content/tunnelScene/preEquComp/preDialog.vue
index e28c042..53b950a 100644
--- a/src/components/content/tunnelScene/preEquComp/preDialog.vue
+++ b/src/components/content/tunnelScene/preEquComp/preDialog.vue
@@ -21,13 +21,17 @@
       <!-- <p>{{ params.equipmentType }}</p> -->
       <!-- </div> -->
       <div class="setting-item">
-        <p>设备名称</p>
+        <p>设备名称:</p>
         <!-- <el-select v-model="equipmentSetting.chooseEquipment" :fit-input-width="true" filterable clearable
           :placeholder="params.equipmentName" disabled>
           <el-option v-for="item in options2" :key="item.value" :label="item.label" :value="item.value" />
         </el-select> -->
         <p>{{ params.equipmentName }}</p>
       </div>
+      <div class="setting-item">
+        <p>参数:</p>
+        <p>31.3%</p>
+      </div>
       <!-- <input-num name="阈值" :placeholder="params.equipmentValue" @inputValue="handelInput"
         :disabled="isDisabledInputNum" />
       <p>{{ params.equipmentValue }}</p> -->
@@ -53,8 +57,19 @@ import {
 } from "vue";
 
 // 定义事件发射器，父组件监听
-const emit = defineEmits(["cancel", "removeEquipment", "addEquipment", "EquInf"]);
-const params = defineProps(["pointNum", "pointGap", "equipmentType", "equipmentName", "equipmentValue"]); //隧道第几个锚点
+const emit = defineEmits([
+  "cancel",
+  "removeEquipment",
+  "addEquipment",
+  "EquInf",
+]);
+const params = defineProps([
+  "pointNum",
+  "pointGap",
+  "equipmentType",
+  "equipmentName",
+  "equipmentValue",
+]); //隧道第几个锚点
 
 // 当前风压
 let p = ref(57);
@@ -68,18 +83,15 @@ let p = ref(57);
 // console.log(params.equipmentName);
 // console.log(params.equipmentValue);
 
-
-
 // let equipmentTypeInf = ref(params.equipmentType)
 // let equipmentNameInf = ref(params.equipmentName)
 // let equipmentValueInf = ref(params.equipmentValue)
 
-
-
 //计算锚点之间距离
 const pointDistance_str = computed(
   () =>
-    `${params.pointGap}米*${params.pointNum}=${params.pointGap * params.pointNum
+    `${params.pointGap}米*${params.pointNum}=${
+      params.pointGap * params.pointNum
     }米`
 );
 
@@ -173,8 +185,8 @@ const equipment = {
 <style lang="scss" scoped>
 #edit-dialog {
   // width: 540px;
-  width: 190px;
-  height: 150px;
+  width: 230px;
+  height: 120px;
   // min-height: 683px;
   background: rgba(7, 35, 72, 0.79);
   border-radius: 20px;
@@ -220,8 +232,6 @@ const equipment = {
     color: white;
     line-height: 35px;
     margin: 20px 30px 0px 30px;
-
-
   }
 
   .equ-info span {
@@ -230,20 +240,22 @@ const equipment = {
 
   .setting {
     .setting-item {
-      padding: 30px 30px 10px 30px;
-
+      padding: 15px 15px 5px 15px;
+      display: flex;
+      gap: 10px;
       p {
         width: 190px;
         height: 35px;
+        line-height: 35px;
         font-size: 18px;
         font-family: MicrosoftYaHei;
         color: #ffffff;
-        line-height: 35px;
-        margin-bottom: 20px;
+        text-align: right;
       }
 
       p:nth-child(2) {
-        color: #f7b500
+        color: #f7b500;
+        text-align: left;
       }
     }
 
@@ -289,14 +301,12 @@ const equipment = {
 
     button[disabled] {
       color: grey !important;
-      opacity: 1
+      opacity: 1;
     }
 
     button {
       cursor: pointer;
       transition: transform 0.1s linear 0s;
-
-
     }
 
     & :nth-child(1) {

From 191c7dbbb529a207921d2b3690f4a94e0f4e48c8 Mon Sep 17 00:00:00 2001
From: odjbin <1042039504@qq.com>
Date: Tue, 20 Aug 2024 21:52:11 +0800
Subject: [PATCH 2/7] =?UTF-8?q?fix=20:=20=E6=B3=A8=E9=87=8A=E5=BA=8F?=
 =?UTF-8?q?=E5=88=97=E5=8F=B7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/device-manage/index.vue | 87 +++++++++++++++++--------------
 1 file changed, 47 insertions(+), 40 deletions(-)

diff --git a/src/views/device-manage/index.vue b/src/views/device-manage/index.vue
index 45f4203..c8bdbfe 100644
--- a/src/views/device-manage/index.vue
+++ b/src/views/device-manage/index.vue
@@ -76,19 +76,19 @@
                             @change="changeFanData(scope.row)"></el-input>
                 </template>
               </el-table-column>
-              <el-table-column prop="serialNumber" label="序列号" align="center" width="500">
-                <template #default="scope">
-                  <el-select placeholder="请选择" v-model="scope.row.serialNumber" popper-class="serialNumber-select"
-                             @change="changeFanData(scope.row)" class="serialNumber">
-                    <el-option
-                        v-for="item in serialNumberOptions"
-                        :key="item.value"
-                        :label="item.label"
-                        :value="item.value"
-                    />
-                  </el-select>
-                </template>
-              </el-table-column>
+<!--              <el-table-column prop="serialNumber" label="序列号" align="center" width="500">-->
+<!--                <template #default="scope">-->
+<!--                  <el-select placeholder="请选择" v-model="scope.row.serialNumber" popper-class="serialNumber-select"-->
+<!--                             @change="changeFanData(scope.row)" class="serialNumber">-->
+<!--                    <el-option-->
+<!--                        v-for="item in serialNumberOptions"-->
+<!--                        :key="item.value"-->
+<!--                        :label="item.label"-->
+<!--                        :value="item.value"-->
+<!--                    />-->
+<!--                  </el-select>-->
+<!--                </template>-->
+<!--              </el-table-column>-->
               <el-table-column prop="state" label="状态" align="center" min-width="86">
                 <template #default="scope">
                   <div class="switch">
@@ -160,19 +160,19 @@
                             @change="changeWindData(scope.row)"></el-input>
                 </template>
               </el-table-column>
-              <el-table-column prop="serialNumber" label="序列号" align="center" width="500">
-                <template #default="scope">
-                  <el-select placeholder="请选择" v-model="scope.row.serialNumber" popper-class="serialNumber-select"
-                             @change="changeWindData(scope.row)" class="serialNumber">
-                    <el-option
-                        v-for="item in serialNumberOptions"
-                        :key="item.value"
-                        :label="item.label"
-                        :value="item.value"
-                    />
-                  </el-select>
-                </template>
-              </el-table-column>
+<!--              <el-table-column prop="serialNumber" label="序列号" align="center" width="500">-->
+<!--                <template #default="scope">-->
+<!--                  <el-select placeholder="请选择" v-model="scope.row.serialNumber" popper-class="serialNumber-select"-->
+<!--                             @change="changeWindData(scope.row)" class="serialNumber">-->
+<!--                    <el-option-->
+<!--                        v-for="item in serialNumberOptions"-->
+<!--                        :key="item.value"-->
+<!--                        :label="item.label"-->
+<!--                        :value="item.value"-->
+<!--                    />-->
+<!--                  </el-select>-->
+<!--                </template>-->
+<!--              </el-table-column>-->
               <el-table-column prop="state" label="状态" align="center">
                 <template #default="scope">
                   <div class="switch wind-switch">
@@ -244,19 +244,19 @@
                             @change="changeOtherData(scope.row)"></el-input>
                 </template>
               </el-table-column>
-              <el-table-column prop="serialNumber" label="序列号" align="center" width="500">
-                <template #default="scope">
-                  <el-select placeholder="请选择" v-model="scope.row.serialNumber" popper-class="serialNumber-select"
-                             @change="changeOtherData(scope.row)" clearable class="serialNumber">
-                    <el-option
-                        v-for="item in serialNumberOptions"
-                        :key="item.value"
-                        :label="item.label"
-                        :value="item.value"
-                    />
-                  </el-select>
-                </template>
-              </el-table-column>
+<!--              <el-table-column prop="serialNumber" label="序列号" align="center" width="500">-->
+<!--                <template #default="scope">-->
+<!--                  <el-select placeholder="请选择" v-model="scope.row.serialNumber" popper-class="serialNumber-select"-->
+<!--                             @change="changeOtherData(scope.row)" clearable class="serialNumber">-->
+<!--                    <el-option-->
+<!--                        v-for="item in serialNumberOptions"-->
+<!--                        :key="item.value"-->
+<!--                        :label="item.label"-->
+<!--                        :value="item.value"-->
+<!--                    />-->
+<!--                  </el-select>-->
+<!--                </template>-->
+<!--              </el-table-column>-->
               <el-table-column prop="state" label="状态" align="center">
                 <template #default="scope">
                   <div class="switch wind-switch">
@@ -636,7 +636,14 @@ getList()
       border-radius: 20px;
       border: 2px solid #05FEFF;
       box-sizing: border-box;
-
+//:deep(.el-input__suffix-inner){
+//  .el-icon{
+//    svg{
+//      width:10em;
+//      height: 10em;
+//    }
+//  }
+//}
       .box-left {
         padding-left: 24px;
         width: 300px;

From 493f816e3c728f206a3f3fa9a7bae2259a19c48c Mon Sep 17 00:00:00 2001
From: odjbin <1042039504@qq.com>
Date: Tue, 20 Aug 2024 22:48:08 +0800
Subject: [PATCH 3/7] =?UTF-8?q?fix=20:=20=E6=B3=A8=E9=87=8A=E5=BA=8F?=
 =?UTF-8?q?=E5=88=97=E5=8F=B7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .drone.yml                        |  2 +-
 src/api/tunnelManage.js           |  5 +-
 src/views/device-manage/index.vue | 91 +++++++++++++++----------------
 src/views/edit/edit.vue           | 30 +++++-----
 4 files changed, 64 insertions(+), 64 deletions(-)

diff --git a/.drone.yml b/.drone.yml
index 47b6292..a75a175 100644
--- a/.drone.yml
+++ b/.drone.yml
@@ -66,7 +66,7 @@ steps:
       # 将deployment中定义的变量替换为drone中的内置变量
       - cat deployment.yml
       # 通过kubectl指令运行deployment.yml,并指定授权文件kubectl_conf.yml
-      - kubectl apply -f deployment.yml -n pro --kubeconfig=/app/config/tunnel-cloud-config.yml
+      - kubectl apply -f deployment.yml -n test --kubeconfig=/app/config/tunnel-cloud-config.yml
 
 volumes:
   - name: build
diff --git a/src/api/tunnelManage.js b/src/api/tunnelManage.js
index 981862e..a6d2c59 100644
--- a/src/api/tunnelManage.js
+++ b/src/api/tunnelManage.js
@@ -56,12 +56,13 @@ export const editEquipment = (data) => {
     data
   })
 }
-export const getEquipmentSerialNumberOptions = (tunnelId) => {
+export const getEquipmentSerialNumberOptions = (tunnelId,equipmentId) => {
   return request({
     url: '/tunnel/tunnel/serialnumber/options',
     method: 'get',
     params:{
-      tunnelId:tunnelId
+      tunnelId:tunnelId,
+      equipmentId:equipmentId
     }
   })
 }
diff --git a/src/views/device-manage/index.vue b/src/views/device-manage/index.vue
index c8bdbfe..63ad8fa 100644
--- a/src/views/device-manage/index.vue
+++ b/src/views/device-manage/index.vue
@@ -76,19 +76,19 @@
                             @change="changeFanData(scope.row)"></el-input>
                 </template>
               </el-table-column>
-<!--              <el-table-column prop="serialNumber" label="序列号" align="center" width="500">-->
-<!--                <template #default="scope">-->
-<!--                  <el-select placeholder="请选择" v-model="scope.row.serialNumber" popper-class="serialNumber-select"-->
-<!--                             @change="changeFanData(scope.row)" class="serialNumber">-->
-<!--                    <el-option-->
-<!--                        v-for="item in serialNumberOptions"-->
-<!--                        :key="item.value"-->
-<!--                        :label="item.label"-->
-<!--                        :value="item.value"-->
-<!--                    />-->
-<!--                  </el-select>-->
-<!--                </template>-->
-<!--              </el-table-column>-->
+              <el-table-column prop="serialNumber" label="序列号" align="center" width="500">
+                <template #default="scope">
+                  <el-select placeholder="请选择" v-model="scope.row.serialNumber" popper-class="serialNumber-select"
+                             @change="changeFanData(scope.row)" class="serialNumber">
+                    <el-option
+                        v-for="item in getSerialNumberOptions(scope.row)"
+                        :key="item.value"
+                        :label="item.label"
+                        :value="item.value"
+                    />
+                  </el-select>
+                </template>
+              </el-table-column>
               <el-table-column prop="state" label="状态" align="center" min-width="86">
                 <template #default="scope">
                   <div class="switch">
@@ -160,19 +160,19 @@
                             @change="changeWindData(scope.row)"></el-input>
                 </template>
               </el-table-column>
-<!--              <el-table-column prop="serialNumber" label="序列号" align="center" width="500">-->
-<!--                <template #default="scope">-->
-<!--                  <el-select placeholder="请选择" v-model="scope.row.serialNumber" popper-class="serialNumber-select"-->
-<!--                             @change="changeWindData(scope.row)" class="serialNumber">-->
-<!--                    <el-option-->
-<!--                        v-for="item in serialNumberOptions"-->
-<!--                        :key="item.value"-->
-<!--                        :label="item.label"-->
-<!--                        :value="item.value"-->
-<!--                    />-->
-<!--                  </el-select>-->
-<!--                </template>-->
-<!--              </el-table-column>-->
+              <el-table-column prop="serialNumber" label="序列号" align="center" width="500">
+                <template #default="scope">
+                  <el-select placeholder="请选择" v-model="scope.row.serialNumber" popper-class="serialNumber-select"
+                             @change="changeWindData(scope.row)" class="serialNumber">
+                    <el-option
+                        v-for="item in getSerialNumberOptions(scope.row)"
+                        :key="item.value"
+                        :label="item.label"
+                        :value="item.value"
+                    />
+                  </el-select>
+                </template>
+              </el-table-column>
               <el-table-column prop="state" label="状态" align="center">
                 <template #default="scope">
                   <div class="switch wind-switch">
@@ -244,19 +244,19 @@
                             @change="changeOtherData(scope.row)"></el-input>
                 </template>
               </el-table-column>
-<!--              <el-table-column prop="serialNumber" label="序列号" align="center" width="500">-->
-<!--                <template #default="scope">-->
-<!--                  <el-select placeholder="请选择" v-model="scope.row.serialNumber" popper-class="serialNumber-select"-->
-<!--                             @change="changeOtherData(scope.row)" clearable class="serialNumber">-->
-<!--                    <el-option-->
-<!--                        v-for="item in serialNumberOptions"-->
-<!--                        :key="item.value"-->
-<!--                        :label="item.label"-->
-<!--                        :value="item.value"-->
-<!--                    />-->
-<!--                  </el-select>-->
-<!--                </template>-->
-<!--              </el-table-column>-->
+              <el-table-column prop="serialNumber" label="序列号" align="center" width="500">
+                <template #default="scope">
+                  <el-select placeholder="请选择" v-model="scope.row.serialNumber" popper-class="serialNumber-select"
+                             @change="changeOtherData(scope.row)" clearable class="serialNumber">
+                    <el-option
+                        v-for="item in getSerialNumberOptions(scope.row)"
+                        :key="item.value"
+                        :label="item.label"
+                        :value="item.value"
+                    />
+                  </el-select>
+                </template>
+              </el-table-column>
               <el-table-column prop="state" label="状态" align="center">
                 <template #default="scope">
                   <div class="switch wind-switch">
@@ -371,9 +371,9 @@ const frequencyData = ref([])
 const serialNumberOptions = ref([])
 const siteId = ref(0)
 const tunnelName = ref('')
-const getSerialNumberOptions = () => {
-  console.log('tunnelId',tunnelId)
-  getEquipmentSerialNumberOptions(tunnelId).then(res => {
+const getSerialNumberOptions = (row) => {
+  console.info("🚀 ~ file:index method:getSerialNumberOptions line:375 -----", row)
+  getEquipmentSerialNumberOptions(tunnelId,row.equipmentId).then(res => {
     if (res.code === 1000) {
       serialNumberOptions.value = res.data
     } else {
@@ -381,7 +381,6 @@ const getSerialNumberOptions = () => {
     }
   })
 }
-getSerialNumberOptions()
 const changeFan = (e) => {
   // const fanObj = {
   //   acquisitionPeriod: e * 1000,
@@ -493,15 +492,15 @@ const getList = () => {
   getEquipmentList(tunnelId).then(res => {
     if (res.code === 1000) {
       fanData.value = res.data.frequencyChangerList
-      res.data.windPressureSensorList.forEach(item => {
+      res.data.windPressureSensorList?.forEach(item => {
         item.offset = item.offset + 4000
       })
       winData.value = res.data.windPressureSensorList
-      res.data.sensorList.forEach(item => {
+      res.data.sensorList?.forEach(item => {
         item.offset = item.offset + 4000
       })
       otherData.value = res.data.sensorList
-      res.data.acquisitionList.map(item => {
+      res.data.acquisitionList?.map(item => {
         item.acquisitionPeriod = item.acquisitionPeriod / 1000
         if (item.typeKey === 'frequency') {
           fanFrequency.value = item.acquisitionPeriod
diff --git a/src/views/edit/edit.vue b/src/views/edit/edit.vue
index 5fceb6c..007c0e6 100644
--- a/src/views/edit/edit.vue
+++ b/src/views/edit/edit.vue
@@ -19,21 +19,21 @@
         <el-form-item label="隧道简称">
           <el-input v-model="form.tunnelAlias" placeholder="请输入隧道简称"/>
         </el-form-item>
-<!--        <el-form-item label="序列号前缀" prop="serialNumberPrefix">-->
-<!--          <el-input v-model="form.serialNumberPrefix" placeholder="请输入序列号前缀"/>-->
-<!--        </el-form-item>-->
-<!--        <el-form-item label="PLC序列号" prop="serialNumber">-->
-<!--          <el-input v-model="form.serialNumber" placeholder="请输入PLC序列号"/>-->
-<!--        </el-form-item>-->
-<!--        <div style="display: flex;flex-direction: column">-->
-<!--          <div v-for="(item,index) in form.serialNumberList" :key="index" >-->
-<!--            <el-form-item :label="'序列号'+(index+2)">-->
-<!--              <div style="flex: 1;display: flex;">-->
-<!--                <el-input v-model="item.serialNumberOne" :placeholder="'请输入序列号'+(index+2)" />-->
-<!--              </div>-->
-<!--            </el-form-item>-->
-<!--          </div>-->
-<!--        </div>-->
+        <el-form-item label="序列号前缀" prop="serialNumberPrefix">
+          <el-input v-model="form.serialNumberPrefix" placeholder="请输入序列号前缀"/>
+        </el-form-item>
+        <el-form-item label="PLC序列号" prop="serialNumber">
+          <el-input v-model="form.serialNumber" placeholder="请输入PLC序列号"/>
+        </el-form-item>
+        <div style="display: flex;flex-direction: column">
+          <div v-for="(item,index) in form.serialNumberList" :key="index" >
+            <el-form-item :label="'序列号'+(index+2)">
+              <div style="flex: 1;display: flex;">
+                <el-input v-model="item.serialNumberOne" :placeholder="'请输入序列号'+(index+2)" />
+              </div>
+            </el-form-item>
+          </div>
+        </div>
         <el-form-item label="隧道长度">
           <el-input type="number" v-model="form.totalLength" placeholder="请输入隧道长度"/>
         </el-form-item>

From 4813161c08327ab4162c37cc83f9da0167c494a6 Mon Sep 17 00:00:00 2001
From: odjbin <1042039504@qq.com>
Date: Wed, 21 Aug 2024 00:21:32 +0800
Subject: [PATCH 4/7] =?UTF-8?q?fix=20:=20=E6=B3=A8=E9=87=8A=E5=BA=8F?=
 =?UTF-8?q?=E5=88=97=E5=8F=B7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .drone.yml                        |   2 +-
 src/views/device-manage/index.vue | 143 +++++++++++++++++-------------
 src/views/edit/edit.vue           |  30 +++----
 3 files changed, 98 insertions(+), 77 deletions(-)

diff --git a/.drone.yml b/.drone.yml
index a75a175..47b6292 100644
--- a/.drone.yml
+++ b/.drone.yml
@@ -66,7 +66,7 @@ steps:
       # 将deployment中定义的变量替换为drone中的内置变量
       - cat deployment.yml
       # 通过kubectl指令运行deployment.yml,并指定授权文件kubectl_conf.yml
-      - kubectl apply -f deployment.yml -n test --kubeconfig=/app/config/tunnel-cloud-config.yml
+      - kubectl apply -f deployment.yml -n pro --kubeconfig=/app/config/tunnel-cloud-config.yml
 
 volumes:
   - name: build
diff --git a/src/views/device-manage/index.vue b/src/views/device-manage/index.vue
index 63ad8fa..b5348e0 100644
--- a/src/views/device-manage/index.vue
+++ b/src/views/device-manage/index.vue
@@ -76,19 +76,19 @@
                             @change="changeFanData(scope.row)"></el-input>
                 </template>
               </el-table-column>
-              <el-table-column prop="serialNumber" label="序列号" align="center" width="500">
-                <template #default="scope">
-                  <el-select placeholder="请选择" v-model="scope.row.serialNumber" popper-class="serialNumber-select"
-                             @change="changeFanData(scope.row)" class="serialNumber">
-                    <el-option
-                        v-for="item in getSerialNumberOptions(scope.row)"
-                        :key="item.value"
-                        :label="item.label"
-                        :value="item.value"
-                    />
-                  </el-select>
-                </template>
-              </el-table-column>
+<!--              <el-table-column prop="serialNumber" label="序列号" align="center" width="500">-->
+<!--                <template #default="scope">-->
+<!--                  <el-select placeholder="请选择" v-model="scope.row.serialNumber" popper-class="serialNumber-select"-->
+<!--                             @change="changeFanData(scope.row)" class="serialNumber">-->
+<!--                    <el-option-->
+<!--                        v-for="item in scope.row.serialNumberOption"-->
+<!--                        :key="item.value"-->
+<!--                        :label="item.label"-->
+<!--                        :value="item.value"-->
+<!--                    />-->
+<!--                  </el-select>-->
+<!--                </template>-->
+<!--              </el-table-column>-->
               <el-table-column prop="state" label="状态" align="center" min-width="86">
                 <template #default="scope">
                   <div class="switch">
@@ -160,19 +160,19 @@
                             @change="changeWindData(scope.row)"></el-input>
                 </template>
               </el-table-column>
-              <el-table-column prop="serialNumber" label="序列号" align="center" width="500">
-                <template #default="scope">
-                  <el-select placeholder="请选择" v-model="scope.row.serialNumber" popper-class="serialNumber-select"
-                             @change="changeWindData(scope.row)" class="serialNumber">
-                    <el-option
-                        v-for="item in getSerialNumberOptions(scope.row)"
-                        :key="item.value"
-                        :label="item.label"
-                        :value="item.value"
-                    />
-                  </el-select>
-                </template>
-              </el-table-column>
+<!--              <el-table-column prop="serialNumber" label="序列号" align="center" width="500">-->
+<!--                <template #default="scope">-->
+<!--                  <el-select placeholder="请选择" v-model="scope.row.serialNumber" popper-class="serialNumber-select"-->
+<!--                             @change="changeWindData(scope.row)" class="serialNumber">-->
+<!--                    <el-option-->
+<!--                        v-for="item in scope.row.serialNumberOption"-->
+<!--                        :key="item.value"-->
+<!--                        :label="item.label"-->
+<!--                        :value="item.value"-->
+<!--                    />-->
+<!--                  </el-select>-->
+<!--                </template>-->
+<!--              </el-table-column>-->
               <el-table-column prop="state" label="状态" align="center">
                 <template #default="scope">
                   <div class="switch wind-switch">
@@ -244,19 +244,19 @@
                             @change="changeOtherData(scope.row)"></el-input>
                 </template>
               </el-table-column>
-              <el-table-column prop="serialNumber" label="序列号" align="center" width="500">
-                <template #default="scope">
-                  <el-select placeholder="请选择" v-model="scope.row.serialNumber" popper-class="serialNumber-select"
-                             @change="changeOtherData(scope.row)" clearable class="serialNumber">
-                    <el-option
-                        v-for="item in getSerialNumberOptions(scope.row)"
-                        :key="item.value"
-                        :label="item.label"
-                        :value="item.value"
-                    />
-                  </el-select>
-                </template>
-              </el-table-column>
+<!--              <el-table-column prop="serialNumber" label="序列号" align="center" width="500">-->
+<!--                <template #default="scope">-->
+<!--                  <el-select placeholder="请选择" v-model="scope.row.serialNumber" popper-class="serialNumber-select"-->
+<!--                             @change="changeOtherData(scope.row)" clearable class="serialNumber">-->
+<!--                    <el-option-->
+<!--                        v-for="item in scope.row.serialNumberOption"-->
+<!--                        :key="item.value"-->
+<!--                        :label="item.label"-->
+<!--                        :value="item.value"-->
+<!--                    />-->
+<!--                  </el-select>-->
+<!--                </template>-->
+<!--              </el-table-column>-->
               <el-table-column prop="state" label="状态" align="center">
                 <template #default="scope">
                   <div class="switch wind-switch">
@@ -371,16 +371,23 @@ const frequencyData = ref([])
 const serialNumberOptions = ref([])
 const siteId = ref(0)
 const tunnelName = ref('')
-const getSerialNumberOptions = (row) => {
-  console.info("🚀 ~ file:index method:getSerialNumberOptions line:375 -----", row)
-  getEquipmentSerialNumberOptions(tunnelId,row.equipmentId).then(res => {
-    if (res.code === 1000) {
-      serialNumberOptions.value = res.data
-    } else {
-      ElMessage.error(res.msg)
-    }
-  })
+const getSerialNumberOptions =async (equipmentId) => {
+  console.log('tunnelId',tunnelId)
+  let {data,code,msg}=await getEquipmentSerialNumberOptions(tunnelId,equipmentId)
+  if(code===1000){
+   return data
+  }else{
+    ElMessage.error(msg)
+  }
+  // getEquipmentSerialNumberOptions(tunnelId,equipmentId).then(res => {
+  //   if (res.code === 1000) {
+  //     serialNumberOptions.value = res.data
+  //   } else {
+  //     ElMessage.error(res.msg)
+  //   }
+  // })
 }
+// getSerialNumberOptions()
 const changeFan = (e) => {
   // const fanObj = {
   //   acquisitionPeriod: e * 1000,
@@ -468,6 +475,7 @@ const editEquip = debounce(() => {
     sensorList: newSensor,
     // shuntList: editFenLiuData.value,
   }
+  console.info("🚀 ~ file:index method: line:478 -----",basicData)
   editEquipment(basicData).then(res => {
     if (res.code === 1000) {
       ElMessage.success('修改成功')
@@ -482,25 +490,34 @@ const handleChangeMenu = (e) => {
   changeIndex.value = e
 }
 
-const getList = () => {
+const getList =async () => {
   const loading = ElLoading.service({
     lock: true,
     text: '正在加载系统资源...',
     background: 'rgba(0, 0, 0, 0.7)',
     customClass: 'allLoading'
   })
-  getEquipmentList(tunnelId).then(res => {
+  await getEquipmentList(tunnelId).then( res => {
     if (res.code === 1000) {
       fanData.value = res.data.frequencyChangerList
+      fanData.value?.forEach( async item => {
+        item.serialNumberOption =await getSerialNumberOptions(item.equipmentId)
+      })
       res.data.windPressureSensorList?.forEach(item => {
         item.offset = item.offset + 4000
       })
       winData.value = res.data.windPressureSensorList
+      winData.value?.forEach( async item => {
+        item.serialNumberOption =await getSerialNumberOptions(item.equipmentId)
+      })
       res.data.sensorList?.forEach(item => {
         item.offset = item.offset + 4000
       })
       otherData.value = res.data.sensorList
-      res.data.acquisitionList?.map(item => {
+      otherData.value?.forEach( async item => {
+        item.serialNumberOption =await getSerialNumberOptions(item.equipmentId)
+      })
+      res.data.acquisitionList.map(item => {
         item.acquisitionPeriod = item.acquisitionPeriod / 1000
         if (item.typeKey === 'frequency') {
           fanFrequency.value = item.acquisitionPeriod
@@ -528,7 +545,18 @@ getList()
 <style lang="scss">
 .serialNumber{
   .el-input{
-    width: 450px!important;
+    width: 466px!important;
+  }
+  .el-input__suffix-inner{
+    .el-icon{
+      width: 3em!important;
+      height: 3em!important;
+      color: #fff!important;
+      svg{
+        width: 3em!important;
+        height: 3em!important;
+      }
+    }
   }
 }
 .el-select.serialNumber {
@@ -629,20 +657,13 @@ getList()
 
     .device-box {
       display: flex;
-      width: 2800px;
+      width: 3200px;
       height: 1600px;
       background: #064B66;
       border-radius: 20px;
       border: 2px solid #05FEFF;
       box-sizing: border-box;
-//:deep(.el-input__suffix-inner){
-//  .el-icon{
-//    svg{
-//      width:10em;
-//      height: 10em;
-//    }
-//  }
-//}
+
       .box-left {
         padding-left: 24px;
         width: 300px;
diff --git a/src/views/edit/edit.vue b/src/views/edit/edit.vue
index 007c0e6..5fceb6c 100644
--- a/src/views/edit/edit.vue
+++ b/src/views/edit/edit.vue
@@ -19,21 +19,21 @@
         <el-form-item label="隧道简称">
           <el-input v-model="form.tunnelAlias" placeholder="请输入隧道简称"/>
         </el-form-item>
-        <el-form-item label="序列号前缀" prop="serialNumberPrefix">
-          <el-input v-model="form.serialNumberPrefix" placeholder="请输入序列号前缀"/>
-        </el-form-item>
-        <el-form-item label="PLC序列号" prop="serialNumber">
-          <el-input v-model="form.serialNumber" placeholder="请输入PLC序列号"/>
-        </el-form-item>
-        <div style="display: flex;flex-direction: column">
-          <div v-for="(item,index) in form.serialNumberList" :key="index" >
-            <el-form-item :label="'序列号'+(index+2)">
-              <div style="flex: 1;display: flex;">
-                <el-input v-model="item.serialNumberOne" :placeholder="'请输入序列号'+(index+2)" />
-              </div>
-            </el-form-item>
-          </div>
-        </div>
+<!--        <el-form-item label="序列号前缀" prop="serialNumberPrefix">-->
+<!--          <el-input v-model="form.serialNumberPrefix" placeholder="请输入序列号前缀"/>-->
+<!--        </el-form-item>-->
+<!--        <el-form-item label="PLC序列号" prop="serialNumber">-->
+<!--          <el-input v-model="form.serialNumber" placeholder="请输入PLC序列号"/>-->
+<!--        </el-form-item>-->
+<!--        <div style="display: flex;flex-direction: column">-->
+<!--          <div v-for="(item,index) in form.serialNumberList" :key="index" >-->
+<!--            <el-form-item :label="'序列号'+(index+2)">-->
+<!--              <div style="flex: 1;display: flex;">-->
+<!--                <el-input v-model="item.serialNumberOne" :placeholder="'请输入序列号'+(index+2)" />-->
+<!--              </div>-->
+<!--            </el-form-item>-->
+<!--          </div>-->
+<!--        </div>-->
         <el-form-item label="隧道长度">
           <el-input type="number" v-model="form.totalLength" placeholder="请输入隧道长度"/>
         </el-form-item>

From d7378bf0afd7532f2b2e8244eda4acb179a04cf0 Mon Sep 17 00:00:00 2001
From: odjbin <1042039504@qq.com>
Date: Sun, 25 Aug 2024 23:00:39 +0800
Subject: [PATCH 5/7] =?UTF-8?q?fix=20:=20=E5=A4=9A=E5=BA=8F=E5=88=97?=
 =?UTF-8?q?=E5=8F=B7=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/tunnelManage.js           |  26 ++-
 src/views/device-manage/index.vue | 259 +++++++++++++++---------------
 src/views/edit/edit.vue           | 154 ++++++++++++++----
 src/views/site/index.vue          |  16 +-
 src/views/tunnel-manage/index.vue | 145 ++++++++++++-----
 5 files changed, 385 insertions(+), 215 deletions(-)

diff --git a/src/api/tunnelManage.js b/src/api/tunnelManage.js
index a6d2c59..c9e0472 100644
--- a/src/api/tunnelManage.js
+++ b/src/api/tunnelManage.js
@@ -56,13 +56,31 @@ export const editEquipment = (data) => {
     data
   })
 }
-export const getEquipmentSerialNumberOptions = (tunnelId,equipmentId) => {
+export const getWindPressureSerialNumberOptions = (tunnelId) => {
   return request({
-    url: '/tunnel/tunnel/serialnumber/options',
+    url: '/tunnel/equipment/serialnumber/wind/pressure/options',
     method: 'get',
     params:{
-      tunnelId:tunnelId,
-      equipmentId:equipmentId
+      tunnelId:tunnelId
+    }
+  })
+}
+export const getOtherSensorSerialNumberOptions = (tunnelId) => {
+  return request({
+    url: '/tunnel/equipment/serialnumber/options',
+    method: 'get',
+    params:{
+      tunnelId:tunnelId
+    }
+  })
+}
+//获取隧道中正在使用的序列号
+export const getSerialNumberOnUse = (tunnelId) => {
+  return request({
+    url: '/tunnel/equipment/serialnumber/on/use',
+    method: 'get',
+    params:{
+      tunnelId:tunnelId
     }
   })
 }
diff --git a/src/views/device-manage/index.vue b/src/views/device-manage/index.vue
index b5348e0..0f3d835 100644
--- a/src/views/device-manage/index.vue
+++ b/src/views/device-manage/index.vue
@@ -36,7 +36,7 @@
             <span>风机设备管理</span>
             <div class="collection-frequency">
               <span>采集频率</span>
-              <el-input type="number" v-model="fanFrequency" @change="changeFan">
+              <el-input type="number" v-model="fanFrequency">
                 <template #suffix>
                   <span>秒/次</span>
                 </template>
@@ -45,62 +45,63 @@
           </div>
           <div class="device-table">
             <el-table stripe
-                      style="border-bottom: 1px #06e5e5 solid;background-color: #011c29;--el-table-border-color: none;"
+                      style="border-bottom: 1px #06e5e5 solid;background-color: #011c29;--el-table-border-color: none;" table-layout="auto"
                       :header-cell-style="{backgroundColor: '#064B66',color: '#fff',fontSize: '40px',borderBottom: 'none' }"
                       :cell-style="{textAlign: 'center',borderBottom: 'none'}" :data="fanData">
               <el-table-column prop="equipmentName" label="设备名称" align="center"/>
               <el-table-column prop="ratedPower" label="额定功率" align="center">
                 <template #default="scope">
                   <el-input placeholder="额定功率" v-model="scope.row.ratedPower"
-                            @change="changeFanData(scope.row)"></el-input>
+                  ></el-input>
                 </template>
               </el-table-column>
               <el-table-column prop="phaseCurrentAOffset" label="A电流偏移量" align="center"/>
               <el-table-column prop="acurrentValue" label="A电流阈值" align="center">
                 <template #default="scope">
                   <el-input placeholder="A电流" v-model="scope.row.acurrentValue"
-                            @change="changeFanData(scope.row)"></el-input>
+                  ></el-input>
                 </template>
               </el-table-column>
               <el-table-column prop="phaseCurrentBOffset" label="B电流偏移量" align="center"/>
               <el-table-column prop="bcurrentValue" label="B电流阈值" align="center">
                 <template #default="scope">
                   <el-input placeholder="B电流" v-model="scope.row.bcurrentValue"
-                            @change="changeFanData(scope.row)"></el-input>
+                  ></el-input>
                 </template>
               </el-table-column>
               <el-table-column prop="phaseCurrentCOffset" label="C电流偏移量" align="center"/>
               <el-table-column prop="ccurrentValue" label="C电流阈值" align="center">
                 <template #default="scope">
                   <el-input placeholder="C电流" v-model="scope.row.ccurrentValue"
-                            @change="changeFanData(scope.row)"></el-input>
+                  ></el-input>
                 </template>
               </el-table-column>
-<!--              <el-table-column prop="serialNumber" label="序列号" align="center" width="500">-->
-<!--                <template #default="scope">-->
-<!--                  <el-select placeholder="请选择" v-model="scope.row.serialNumber" popper-class="serialNumber-select"-->
-<!--                             @change="changeFanData(scope.row)" class="serialNumber">-->
-<!--                    <el-option-->
-<!--                        v-for="item in scope.row.serialNumberOption"-->
-<!--                        :key="item.value"-->
-<!--                        :label="item.label"-->
-<!--                        :value="item.value"-->
-<!--                    />-->
-<!--                  </el-select>-->
-<!--                </template>-->
-<!--              </el-table-column>-->
-              <el-table-column prop="state" label="状态" align="center" min-width="86">
+              <el-table-column prop="serialNumber" label="序列号" align="center" width="500">
+                <template #default="scope">
+                  <!--                  {{scope.row.serialNumberOption.filter(item => item.value == scope.row.serialNumber).map(item => item.label)[0]}}?-->
+                  <!--                  <el-select placeholder="请选择" v-model="scope.row.serialNumber" popper-class="serialNumber-select"-->
+                  <!--                               clearable class="serialNumber">-->
+                  <!--                    <el-option-->
+                  <!--                        v-for="item in scope.row.serialNumberOption"-->
+                  <!--                        :key="item.value"-->
+                  <!--                        :label="item.label"-->
+                  <!--                        :value="item.value"-->
+                  <!--                    />-->
+                  <!--                  </el-select>-->
+                </template>
+              </el-table-column>
+              <el-table-column prop="state" label="状态" align="center"  width="200">
                 <template #default="scope">
                   <div class="switch">
                     <div
                         :class="{ active: scope.row.state }"
-                        @click="scope.row.state = 1;changeFanData(scope.row)"
+                        @click="scope.row.state = 1; "
                     >
                       启用
                     </div>
                     <div
                         :class="{ active: ! scope.row.state }"
-                        @click=" scope.row.state = 0;changeFanData(scope.row)"
+                        @click=" scope.row.state = 0; "
                     >
                       停用
                     </div>
@@ -123,7 +124,7 @@
             <span>风压设备管理</span>
             <div class="collection-frequency">
               <span>采集频率</span>
-              <el-input type="number" v-model="windFrequency" @change="changeWind">
+              <el-input type="number" v-model="windFrequency">
                 <template #suffix>
                   <span>秒/次</span>
                 </template>
@@ -131,7 +132,7 @@
             </div>
           </div>
           <div class="device-table">
-            <el-table stripe
+            <el-table stripe table-layout="auto"
                       style="border-bottom: 1px #06e5e5 solid;background-color: #011c29;--el-table-border-color: none;"
                       :header-cell-style="{backgroundColor: '#064B66',color: '#fff',fontSize: '40px',borderBottom: 'none' }"
                       :cell-style="{textAlign: 'center',borderBottom: 'none'}" :data="winData">
@@ -139,52 +140,54 @@
               <el-table-column prop="offset" label="偏移量" align="center"/>
               <el-table-column prop="unit" label="单位" align="center">
                 <template #default="scope">
-                  <el-input placeholder="单位" v-model="scope.row.unit" @change="changeWindData(scope.row)"></el-input>
+                  <el-input placeholder="单位" v-model="scope.row.unit"  ></el-input>
                 </template>
               </el-table-column>
               <el-table-column prop="alarmValue" label="阈值" align="center">
                 <template #default="scope">
                   <el-input placeholder="阈值" v-model="scope.row.alarmValue"
-                            @change="changeWindData(scope.row)"></el-input>
+                  ></el-input>
                 </template>
               </el-table-column>
               <el-table-column prop="miniRange" label="最小范围" align="center">
                 <template #default="scope">
                   <el-input placeholder="最小范围" v-model="scope.row.miniRange"
-                            @change="changeWindData(scope.row)"></el-input>
+                  ></el-input>
                 </template>
               </el-table-column>
               <el-table-column prop="maxRange" label="最大范围" align="center">
                 <template #default="scope">
                   <el-input placeholder="最大范围" v-model="scope.row.maxRange"
-                            @change="changeWindData(scope.row)"></el-input>
+                  ></el-input>
                 </template>
               </el-table-column>
-<!--              <el-table-column prop="serialNumber" label="序列号" align="center" width="500">-->
-<!--                <template #default="scope">-->
-<!--                  <el-select placeholder="请选择" v-model="scope.row.serialNumber" popper-class="serialNumber-select"-->
-<!--                             @change="changeWindData(scope.row)" class="serialNumber">-->
-<!--                    <el-option-->
-<!--                        v-for="item in scope.row.serialNumberOption"-->
-<!--                        :key="item.value"-->
-<!--                        :label="item.label"-->
-<!--                        :value="item.value"-->
-<!--                    />-->
-<!--                  </el-select>-->
-<!--                </template>-->
-<!--              </el-table-column>-->
-              <el-table-column prop="state" label="状态" align="center">
+              <el-table-column prop="serialNumber" label="序列号" align="center" width="500">
+                <template #default="scope">
+                  <el-select placeholder="请选择" v-model="scope.row.serialNumber" popper-class="serialNumber-select"
+                             clearable class="serialNumber" @clear="clearWinDataSelectedOption" @change="changeWindDataSerialNumber($event,scope.row.serialNumberOption)">
+                    <el-option
+                        v-for="item in scope.row.serialNumberOption"
+                        :key="item.value"
+                        :label="item.label"
+                        :value="item.value"
+                        :disabled="serialNumberOptionDisabled(item)"
+                        :title="serialNumberOptionDisabled(item)?'该4G序列号已选择':''"
+                    />
+                  </el-select>
+                </template>
+              </el-table-column>
+              <el-table-column prop="state" label="状态" align="center" width="200">
                 <template #default="scope">
                   <div class="switch wind-switch">
                     <div
                         :class="{ active: scope.row.state }"
-                        @click=" scope.row.state = 1;changeWindData(scope.row)"
+                        @click=" scope.row.state = 1; "
                     >
                       启用
                     </div>
                     <div
                         :class="{ active: ! scope.row.state }"
-                        @click=" scope.row.state =  0;changeWindData(scope.row)"
+                        @click=" scope.row.state =  0; "
                     >
                       停用
                     </div>
@@ -207,7 +210,7 @@
             <span>其他传感器设备管理</span>
             <div class="collection-frequency">
               <span>采集频率</span>
-              <el-input type="number" v-model="otherFrequency" @change="changeOther">
+              <el-input type="number" v-model="otherFrequency">
                 <template #suffix>
                   <span>秒/次</span>
                 </template>
@@ -215,7 +218,7 @@
             </div>
           </div>
           <div class="device-table">
-            <el-table stripe
+            <el-table stripe table-layout="auto"
                       style="border-bottom: 1px #06e5e5 solid;background-color: #011c29;--el-table-border-color: none;"
                       :header-cell-style="{backgroundColor: '#064B66',color: '#fff',fontSize: '40px',borderBottom: 'none' }"
                       :cell-style="{textAlign: 'center',borderBottom: 'none'}" :data="otherData">
@@ -223,52 +226,52 @@
               <el-table-column prop="offset" label="偏移量" align="center"/>
               <el-table-column prop="unit" label="单位" align="center">
                 <template #default="scope">
-                  <el-input placeholder="单位" v-model="scope.row.unit" @change="changeOtherData(scope.row)"></el-input>
+                  <el-input placeholder="单位" v-model="scope.row.unit"  ></el-input>
                 </template>
               </el-table-column>
               <el-table-column prop="alarmValue" label="阈值" align="center">
                 <template #default="scope">
                   <el-input placeholder="阈值" v-model="scope.row.alarmValue"
-                            @change="changeOtherData(scope.row)"></el-input>
+                  ></el-input>
                 </template>
               </el-table-column>
               <el-table-column prop="miniRange" label="最小范围" align="center">
                 <template #default="scope">
                   <el-input placeholder="最小范围" v-model="scope.row.miniRange"
-                            @change="changeOtherData(scope.row)"></el-input>
+                  ></el-input>
                 </template>
               </el-table-column>
               <el-table-column prop="maxRange" label="最大范围" align="center">
                 <template #default="scope">
                   <el-input placeholder="最大范围" v-model="scope.row.maxRange"
-                            @change="changeOtherData(scope.row)"></el-input>
+                  ></el-input>
                 </template>
               </el-table-column>
-<!--              <el-table-column prop="serialNumber" label="序列号" align="center" width="500">-->
-<!--                <template #default="scope">-->
-<!--                  <el-select placeholder="请选择" v-model="scope.row.serialNumber" popper-class="serialNumber-select"-->
-<!--                             @change="changeOtherData(scope.row)" clearable class="serialNumber">-->
-<!--                    <el-option-->
-<!--                        v-for="item in scope.row.serialNumberOption"-->
-<!--                        :key="item.value"-->
-<!--                        :label="item.label"-->
-<!--                        :value="item.value"-->
-<!--                    />-->
-<!--                  </el-select>-->
-<!--                </template>-->
-<!--              </el-table-column>-->
-              <el-table-column prop="state" label="状态" align="center">
+              <el-table-column prop="serialNumber" label="序列号" align="center" width="500">
+                <template #default="scope">
+                  <el-select placeholder="请选择" v-model="scope.row.serialNumber" popper-class="serialNumber-select"
+                             clearable class="serialNumber">
+                    <el-option
+                        v-for="item in otherSensorSerialNumberOptions"
+                        :key="item.value"
+                        :label="item.label"
+                        :value="item.value"
+                    />
+                  </el-select>
+                </template>
+              </el-table-column>
+              <el-table-column prop="state" label="状态" align="center" width="200">
                 <template #default="scope">
                   <div class="switch wind-switch">
                     <div
                         :class="{ active: scope.row.state }"
-                        @click=" scope.row.state = 1;changeOtherData(scope.row)"
+                        @click=" scope.row.state = 1; "
                     >
                       启用
                     </div>
                     <div
                         :class="{ active: ! scope.row.state }"
-                        @click=" scope.row.state =  0;changeOtherData(scope.row)"
+                        @click=" scope.row.state =  0; "
                     >
                       停用
                     </div>
@@ -311,7 +314,7 @@
                             @change="changeFenData(scope.row)"></el-input>
                 </template>
               </el-table-column>
-              <el-table-column prop="state" label="状态" align="center">
+              <el-table-column prop="state" label="状态" align="center"  width="200">
                 <template #default="scope">
                   <div class="switch">
                     <div
@@ -347,7 +350,7 @@
 
 <script setup>
 import {ElLoading, ElMessage} from "element-plus";
-import {getEquipmentList, editEquipment, getTunnelDetail, getEquipmentSerialNumberOptions} from "@/api/tunnelManage";
+import {getEquipmentList, editEquipment, getTunnelDetail,getOtherSensorSerialNumberOptions, getWindPressureSerialNumberOptions} from "@/api/tunnelManage";
 import TunnelTitle from "@/components/tunnelTitle/index.vue";
 import {debounce} from 'lodash'
 
@@ -360,66 +363,49 @@ const windFrequency = ref(0)
 const otherFrequency = ref(0)
 const changeIndex = ref(1)
 const fanData = ref([])
-const editFanData = ref([])
 const winData = ref([])
-const editWinData = ref([])
+const windPressureDataSerialNumberOptions = ref([])
+const otherSensorSerialNumberOptions = ref([])
 const otherData = ref([])
-const editOtherData = ref([])
+const winDataSelectedOption = ref([])
 const fenLiuData = ref([])
-const editFenLiuData = ref([])
-const frequencyData = ref([])
-const serialNumberOptions = ref([])
 const siteId = ref(0)
 const tunnelName = ref('')
-const getSerialNumberOptions =async (equipmentId) => {
-  console.log('tunnelId',tunnelId)
-  let {data,code,msg}=await getEquipmentSerialNumberOptions(tunnelId,equipmentId)
+const getWindPressureOptions =async () => {
+  let {data,code,msg}=await getWindPressureSerialNumberOptions(tunnelId)
   if(code===1000){
-   return data
+    // windPressureDataSerialNumberOptions.value= data
+    return data
   }else{
     ElMessage.error(msg)
   }
-  // getEquipmentSerialNumberOptions(tunnelId,equipmentId).then(res => {
-  //   if (res.code === 1000) {
-  //     serialNumberOptions.value = res.data
-  //   } else {
-  //     ElMessage.error(res.msg)
-  //   }
-  // })
 }
-// getSerialNumberOptions()
-const changeFan = (e) => {
-  // const fanObj = {
-  //   acquisitionPeriod: e * 1000,
-  //   tunnelId: tunnelId,
-  //   typeKey: 'frequency'
-  // }
-  // frequencyData.value.push(fanObj)
+
+const getOtherSensorOptions =async () => {
+  let {data,code,msg}=await getOtherSensorSerialNumberOptions(tunnelId)
+  if(code===1000){
+    otherSensorSerialNumberOptions.value= data
+  }else{
+    ElMessage.error(msg)
+  }
 }
-const changeFanData = (row) => {
-  // editFanData.value.push(row)
+getOtherSensorOptions()
+const clearWinDataSelectedOption=()=>{
+  winDataSelectedOption.value=[]
 }
-const changeWind = (e) => {
-  // const windObj = {
-  //   acquisitionPeriod: e * 1000,
-  //   tunnelId: tunnelId,
-  //   typeKey: 'windPressure'
-  // }
-  // frequencyData.value.push(windObj)
+const changeWindDataSerialNumber = (value,options) => {
+  options?.forEach(item=>{
+    if(item.value==value){
+      if(item.label.indexOf('4G')>=0){
+        winDataSelectedOption.value.push(value)
+      }else{
+        winDataSelectedOption.value=[]
+      }
+    }
+  })
 }
-const changeWindData = (row) => {
-  // editWinData.value.push(row)
-}
-const changeOther = (e) => {
-  // const otherObj = {
-  //   acquisitionPeriod: e * 1000,
-  //   tunnelId: tunnelId,
-  //   typeKey: 'sensor'
-  // }
-  // frequencyData.value.push(otherObj)
-}
-const changeOtherData = (row) => {
-  // editOtherData.value.push(row)
+const serialNumberOptionDisabled=(item)=>{
+  return winDataSelectedOption.value.indexOf(item.value) >= 0;
 }
 const changeData = (item) => {
   return {
@@ -433,6 +419,12 @@ const changeData = (item) => {
   }
 }
 const editEquip = debounce(() => {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '修改中...',
+    background: 'rgba(0, 0, 0, 0.7)',
+    customClass: 'allLoading'
+  })
   let newFrequency = [{
     acquisitionPeriod: fanFrequency.value * 1000,
     tunnelId: parseInt(tunnelId),
@@ -478,10 +470,13 @@ const editEquip = debounce(() => {
   console.info("🚀 ~ file:index method: line:478 -----",basicData)
   editEquipment(basicData).then(res => {
     if (res.code === 1000) {
+      loading.close()
       ElMessage.success('修改成功')
       router.push('/tunnel/' + siteId.value + '/' + type + '/' + userId)
     } else {
       ElMessage.error(res.msg)
+      loading.close()
+
     }
   })
 }, 100)
@@ -490,7 +485,8 @@ const handleChangeMenu = (e) => {
   changeIndex.value = e
 }
 
-const getList =async () => {
+const getList = async () => {
+  const windPressureOption=await getWindPressureOptions()
   const loading = ElLoading.service({
     lock: true,
     text: '正在加载系统资源...',
@@ -500,23 +496,21 @@ const getList =async () => {
   await getEquipmentList(tunnelId).then( res => {
     if (res.code === 1000) {
       fanData.value = res.data.frequencyChangerList
-      fanData.value?.forEach( async item => {
-        item.serialNumberOption =await getSerialNumberOptions(item.equipmentId)
-      })
       res.data.windPressureSensorList?.forEach(item => {
         item.offset = item.offset + 4000
       })
       winData.value = res.data.windPressureSensorList
-      winData.value?.forEach( async item => {
-        item.serialNumberOption =await getSerialNumberOptions(item.equipmentId)
+      winData.value?.forEach(item => {
+        for (const equipmentId in windPressureOption) {
+          if(item.equipmentId == equipmentId){
+            item.serialNumberOption =windPressureOption[equipmentId]
+          }
+        }
       })
       res.data.sensorList?.forEach(item => {
         item.offset = item.offset + 4000
       })
       otherData.value = res.data.sensorList
-      otherData.value?.forEach( async item => {
-        item.serialNumberOption =await getSerialNumberOptions(item.equipmentId)
-      })
       res.data.acquisitionList.map(item => {
         item.acquisitionPeriod = item.acquisitionPeriod / 1000
         if (item.typeKey === 'frequency') {
@@ -545,7 +539,7 @@ getList()
 <style lang="scss">
 .serialNumber{
   .el-input{
-    width: 466px!important;
+    width: 580px!important;
   }
   .el-input__suffix-inner{
     .el-icon{
@@ -585,7 +579,7 @@ getList()
   background: #064B66 !important;
   border: 2px solid #05FEFF !important;
 
-.el-select-dropdown {
+  .el-select-dropdown {
     min-width: 130px !important;
   }
   .el-select-dropdown__item.is-hovering{
@@ -599,12 +593,19 @@ getList()
       border-bottom: none;
     }
   }
-
+  .el-select-dropdown__item.selected {
+    background-color: transparent !important;
+    color: #F7B500;
+  }
   .el-select-dropdown__item.hover,
   .el-select-dropdown__item:hover {
     background-color: transparent !important;
     color: #F7B500;
   }
+  .el-select-dropdown__item.is-disabled{
+    background-color: transparent !important;
+    color: #fff!important;
+  }
 }
 </style>
 <style scoped lang="scss">
@@ -657,7 +658,7 @@ getList()
 
     .device-box {
       display: flex;
-      width: 3200px;
+      width: 3500px;
       height: 1600px;
       background: #064B66;
       border-radius: 20px;
@@ -779,7 +780,7 @@ getList()
         }
 
         .wind-switch {
-          margin-left: 26px;
+          //margin-left: 26px;
         }
 
         .switch {
diff --git a/src/views/edit/edit.vue b/src/views/edit/edit.vue
index 5fceb6c..12341f6 100644
--- a/src/views/edit/edit.vue
+++ b/src/views/edit/edit.vue
@@ -12,28 +12,65 @@
       </div>
     </div>
     <div class="edit-box">
-      <el-form :model="form" :label-position="right" label-width="230px">
+      <el-form :model="form" :label-position="right"  label-width="230px">
         <el-form-item label="隧道名称">
           <el-input v-model="form.tunnelName" placeholder="请输入隧道名称"/>
         </el-form-item>
         <el-form-item label="隧道简称">
           <el-input v-model="form.tunnelAlias" placeholder="请输入隧道简称"/>
         </el-form-item>
-<!--        <el-form-item label="序列号前缀" prop="serialNumberPrefix">-->
-<!--          <el-input v-model="form.serialNumberPrefix" placeholder="请输入序列号前缀"/>-->
-<!--        </el-form-item>-->
-<!--        <el-form-item label="PLC序列号" prop="serialNumber">-->
-<!--          <el-input v-model="form.serialNumber" placeholder="请输入PLC序列号"/>-->
-<!--        </el-form-item>-->
-<!--        <div style="display: flex;flex-direction: column">-->
-<!--          <div v-for="(item,index) in form.serialNumberList" :key="index" >-->
-<!--            <el-form-item :label="'序列号'+(index+2)">-->
-<!--              <div style="flex: 1;display: flex;">-->
-<!--                <el-input v-model="item.serialNumberOne" :placeholder="'请输入序列号'+(index+2)" />-->
-<!--              </div>-->
-<!--            </el-form-item>-->
-<!--          </div>-->
-<!--        </div>-->
+        <el-form-item label="序列号前缀" prop="serialNumberPrefix">
+          <el-input v-model="form.serialNumberPrefix" placeholder="请输入序列号前缀"/>
+        </el-form-item>
+        <!--        <el-form-item label="序列号1" prop="serialNumber">-->
+        <!--          <el-input v-model="form.serialNumber" placeholder="请输入序列号1"/>-->
+        <!--        </el-form-item>-->
+        <!--        <el-form-item label="序列号2" prop="serialNumberOne">-->
+        <!--          <el-input v-model="form.serialNumberOne" placeholder="请输入序列号2"/>-->
+        <!--        </el-form-item>-->
+
+        <el-form-item label="PLC序列号" prop="serialNumber">
+          <el-input v-model="form.serialNumber" placeholder="请输入PLC序列号"/>
+        </el-form-item>
+        <div style="display: flex;flex-direction: column">
+          <div style="display:flex;align-items:center;justify-content:flex-end;font-size: 38px;color: #08B7B8;">
+            <span style="cursor: pointer;" @click="addSerialNumber">添加序列号</span>
+            <el-icon size="74" color="#08B7B8" style="margin-left: 20px;cursor: pointer;" @click="addSerialNumber">
+              <CirclePlus/>
+            </el-icon>
+          </div>
+          <div v-for="(item,index) in form.tunnelGatewayVoList" :key="index">
+            <el-form-item label="序列号名称">
+              <div style="flex: 1;display: flex;">
+                <el-input v-model="item.serialNumberType" placeholder="请输入序列号名称" :disabled="item.isUse"
+                          :style="{'margin-right':item.isUse? '94px':''}" :title="item.isUse?'该序列号正在使用中, 暂不能修改':''"/>
+                <el-icon v-if="!item.isUse" size="74" color="#08B7B8" style="margin-left: 20px;cursor: pointer"
+                         @click="delSerialNumber(index)">
+                  <Remove/>
+                </el-icon>
+              </div>
+            </el-form-item>
+            <el-form-item :label="item.serialNumberType+'序列号'" class="serialNumber-name-overflow-hidden">
+              <el-input v-model="item.serialNumber" :placeholder="'请输入'+item.serialNumberType+'序列号'"
+                        style="margin-right: 94px" :disabled="item.isUse" :title="item.isUse?'该序列号正在使用中, 暂不能修改':''"/>
+            </el-form-item>
+          </div>
+        </div>
+        <!--                <div style="display: flex;flex-direction: column">-->
+        <!--                  <div v-for="(item,index) in form.tunnelGatewayVoList" :key="index" >-->
+        <!--                    <el-form-item :label="'序列号'+(index+2)">-->
+        <!--                      <div style="flex: 1;display: flex;">-->
+        <!--                        <el-input v-model="item.serialNumberOne" :placeholder="'请输入序列号'+(index+2)" />-->
+        <!--                        <el-icon size="74" color="#08B7B8" style="margin-left: 20px;cursor: pointer" @click="addSerialNumber" v-if="index===0">-->
+        <!--                          <CirclePlus/>-->
+        <!--                        </el-icon>-->
+        <!--                        <el-icon v-else size="74" color="#08B7B8" style="margin-left: 20px;cursor: pointer" @click="delSerialNumber(index)" >-->
+        <!--                          <Remove/>-->
+        <!--                        </el-icon>-->
+        <!--                      </div>-->
+        <!--                    </el-form-item>-->
+        <!--                  </div>-->
+        <!--                </div>-->
         <el-form-item label="隧道长度">
           <el-input type="number" v-model="form.totalLength" placeholder="请输入隧道长度"/>
         </el-form-item>
@@ -86,20 +123,22 @@
 </template>
 <script setup>
 import TunnelScene from "@/components/content/tunnelScene/TunnelScene.vue";
-import {editTunnel, getTunnelDetail} from "@/api/tunnelManage";
+import {editTunnel, getTunnelDetail, getSerialNumberOnUse} from "@/api/tunnelManage";
 import {ElLoading, ElMessage} from "element-plus";
 import {initSceneData} from "@/api/tunnelScene";
 import TunnelTitle from "@/components/tunnelTitle/index.vue";
-import { debounce } from 'lodash'
+import {debounce} from 'lodash'
+
 const router = useRouter();
 const tunnelId = reactive(router.currentRoute.value.params.tunnelId);
 const userId = reactive(router.currentRoute.value.params.userId);
 const type = reactive(router.currentRoute.value.params.type);
 const modelEquipmentList = ref(null)
+const isShowRemove = ref(false)
 const form = ref({
   tunnelName: "",
   serialNumberPrefix: '',
-  serialNumberOne: '',
+  // serialNumber: '',
   serialNumber: '',
   totalLength: "",
   referenceFrequency: '',
@@ -109,18 +148,43 @@ const form = ref({
   dropFrequency: '',
   isDefault: false,
   remarks: "",
-  serialNumberList:[]
+  tunnelGatewayVoList: []
 });
-const getTunnel = () => {
+const addSerialNumber = () => {
+  form.value.tunnelGatewayVoList.push({
+    serialNumber: '',
+    serialNumberType: '',
+  })
+}
+const delSerialNumber = (index) => {
+  form.value.tunnelGatewayVoList.splice(index, 1)
+}
+const getSerialNumberOnUseList = async () => {
+  let {data, code} = await getSerialNumberOnUse(tunnelId)
+  if (code === 1000) {
+    return data
+  }
+}
+const getTunnel = async () => {
+  let serialNumberOnUseList = await getSerialNumberOnUseList()
   const loading = ElLoading.service({
     lock: true,
     text: '正在加载系统资源...',
     background: 'rgba(0, 0, 0, 0.7)',
-    customClass:'allLoading'
+    customClass: 'allLoading'
   })
-  getTunnelDetail(tunnelId).then((res) => {
+  await getTunnelDetail(tunnelId).then((res) => {
     if (res?.code === 1000) {
-      res.data.serialNumberList= res.data.serialNumberList?.map(item=>({serialNumberOne:item}))
+      res.data.tunnelGatewayVoList?.forEach((item) => {
+        serialNumberOnUseList?.forEach((serialNumberOnUseItem) => {
+          if (item.serialNumber == serialNumberOnUseItem) {
+            item.isUse = true
+          }
+        })
+      })
+      if(!res.data.tunnelGatewayVoList){
+        res.data.tunnelGatewayVoList=[]
+      }
       form.value = res.data;
     }
     loading.close()
@@ -139,33 +203,39 @@ const handleGoTunnelMgr = () => {
   router.push("/tunnel/" + form.value.siteId + "/" + type + "/" + userId);
 };
 const getTunnelInfo = () => {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '修改中...',
+    background: 'rgba(0, 0, 0, 0.7)',
+    customClass: 'allLoading'
+  })
   initSceneData(tunnelId).then((res) => {
     modelEquipmentList.value = JSON.parse(res.data.tunnelThreeConfig)
     if (modelEquipmentList.value === null) {
       modelEquipmentList.value = []
     }
-
-    let serialNumberList=form.value.serialNumberList.map(item=>item.serialNumberOne)
     const data = {
       tunnelId: tunnelId,
       ...form.value,
-      serialNumberList:serialNumberList,
+      tunnelGatewayDtoList: form.value.tunnelGatewayVoList,
       tunnelLength: form.value.totalLength,
       modelEquipmentList: modelEquipmentList.value,
     };
     editTunnel(data).then((res) => {
       if (res?.code === 1000) {
+        loading.close()
         ElMessage.success(res.msg);
         router.push("/tunnel/" + form.value.siteId + "/" + type + "/" + userId);
       } else {
         ElMessage.error(res.msg);
+        loading.close()
       }
     });
   })
 }
-const handleSave =debounce(() => {
+const handleSave = debounce(() => {
   getTunnelInfo()
-},100)
+}, 100)
 </script>
 <style lang="scss" scoped>
 :deep(.el-form-item__content) {
@@ -253,13 +323,30 @@ const handleSave =debounce(() => {
     height: 100%;
   }
 
+  .edit-box::-webkit-scrollbar {
+    width: 6px;
+  }
+
+  // 滚动条轨道
+  .edit-box::-webkit-scrollbar-track {
+    background: transparent;
+    border-radius: 2px;
+  }
+
+  // 小滑块
+  .edit-box::-webkit-scrollbar-thumb {
+    background: rgb(8, 183, 184);
+    border-radius: 10px;
+  }
+
   .edit-box {
     z-index: 2;
     position: absolute;
     top: 250px;
     left: 80px;
     width: 1000px;
-    //height: 500px;
+    height: 1500px;
+    overflow-y: scroll;
     background-image: url(@/assets/images/transducer/bg.png);
     padding: 20px 30px;
     box-sizing: border-box;
@@ -304,7 +391,13 @@ const handleSave =debounce(() => {
       font-size: 38px;
       color: #ffffff;
       margin-right: 12px;
+      height: 50px;
       line-height: 50px;
+      word-break: break-all;
+      //text-overflow: ellipsis;
+      //overflow: hidden;
+      //white-space: nowrap;
+      //-webkit-line-clamp: 2;
     }
 
     :deep(.el-input) {
@@ -319,6 +412,7 @@ const handleSave =debounce(() => {
           color: #fff;
           font-size: 38px;
         }
+
         .el-input__suffix-inner {
           font-size: 30px;
           color: #08B7B8;
diff --git a/src/views/site/index.vue b/src/views/site/index.vue
index 39bb1ec..8c69acb 100644
--- a/src/views/site/index.vue
+++ b/src/views/site/index.vue
@@ -53,12 +53,12 @@
             <div class="edit-icon"></div>
             <div>站点编辑</div>
           </div>
-          <div v-if="item.totalTunnel!==0" @click="handleUpload(item.siteId)">
-            <el-icon style="margin-left: 20px">
-              <UploadFilled/>
-            </el-icon>
-            <div>上传图纸</div>
-          </div>
+<!--          <div v-if="item.totalTunnel!==0" @click="handleUpload(item.siteId)">-->
+<!--            <el-icon style="margin-left: 20px">-->
+<!--              <UploadFilled/>-->
+<!--            </el-icon>-->
+<!--            <div>上传图纸</div>-->
+<!--          </div>-->
         </div>
       </div>
       <div class="site-box add-box" v-if="showAddIcon" @click="handleAdd">
@@ -168,8 +168,8 @@ const info = ref({
 const title = ref('新增站点')
 const isVisited = ref(false);
 let isUploadVisited = ref(false);
-const showFirst = ref(true)
-const total = ref(10);
+const showFirst = ref(false)
+const total = ref(0);
 const showAddIcon = ref(true)
 const pageInfo = reactive({
   pageNum: 1,
diff --git a/src/views/tunnel-manage/index.vue b/src/views/tunnel-manage/index.vue
index 719272a..8561e32 100644
--- a/src/views/tunnel-manage/index.vue
+++ b/src/views/tunnel-manage/index.vue
@@ -20,7 +20,7 @@
       <!--      </div>-->
       <tunnel-title/>
       <div class="all-del-btn" v-if="showOperation">
-        <div class="all-btn" style=" margin-right: 40px;" v-if="!showAddIcon" @click="handleAdd">
+        <div class="all-btn" style=" margin-right: 40px;" v-if="showAddIcon" @click="handleAdd">
           添加
         </div>
         <div class="all-btn" @click="handleChooseAll">
@@ -67,6 +67,7 @@
           </div>
         </div>
       </div>
+<!--/*      <div style="width: 925px; height: 0" v-for="n in 8" :key="n"></div>*/-->
       <div class="site-box add-box" @click="handleAdd" v-if="showOperation">
         <div class="add-icon"></div>
         <div style="cursor: pointer">添加隧道</div>
@@ -97,27 +98,61 @@
         <el-form-item label="隧道简称" prop="tunnelAlias">
           <el-input v-model="form.tunnelAlias" placeholder="请输入隧道简称"/>
         </el-form-item>
-<!--        <el-form-item label="序列号前缀" prop="serialNumberPrefix">-->
-<!--          <el-input v-model="form.serialNumberPrefix" placeholder="请输入序列号前缀"/>-->
-<!--        </el-form-item>-->
-<!--        <el-form-item label="PLC序列号" prop="serialNumber">-->
-<!--          <el-input v-model="form.serialNumber" placeholder="请输入PLC序列号"/>-->
-<!--        </el-form-item>-->
-<!--        <div style="display: flex;flex-direction: column">-->
-<!--          <div v-for="(item,index) in serialNumberList" :key="index" >-->
-<!--            <el-form-item :label="'序列号'+(index+2)">-->
-<!--              <div style="flex: 1;display: flex;">-->
-<!--                <el-input v-model="item.serialNumberOne" :placeholder="'请输入序列号'+(index+2)" />-->
-<!--                <el-icon size="74" color="#08B7B8" style="margin-left: 20px;cursor: pointer" @click="addSerialNumber" v-if="index===0">-->
-<!--                  <CirclePlus/>-->
-<!--                </el-icon>-->
-<!--                <el-icon v-else size="74" color="#08B7B8" style="margin-left: 20px;cursor: pointer" @click="delSerialNumber(index)" >-->
-<!--                  <Remove/>-->
-<!--                </el-icon>-->
-<!--              </div>-->
-<!--            </el-form-item>-->
-<!--          </div>-->
-<!--        </div>-->
+        <el-form-item label="序列号前缀" prop="serialNumberPrefix">
+          <el-input v-model="form.serialNumberPrefix" placeholder="请输入序列号前缀"/>
+        </el-form-item>
+        <!--        <el-form-item label="序列号1" prop="serialNumber">-->
+        <!--          <el-input v-model="form.serialNumber" placeholder="请输入序列号1"/>-->
+        <!--        </el-form-item>-->
+        <!--        <el-form-item label="序列号2" prop="serialNumberOne">-->
+        <!--          <el-input v-model="form.serialNumberOne" placeholder="请输入序列号2"/>-->
+        <!--        </el-form-item>-->
+
+        <el-form-item label="PLC序列号" prop="serialNumber">
+          <el-input v-model="form.serialNumber" placeholder="请输入PLC序列号"/>
+        </el-form-item>
+        <div style="display: flex;flex-direction: column">
+          <div style="display:flex;align-items:center;justify-content:flex-end;font-size: 38px;color: #08B7B8;">
+            <span style="cursor: pointer;" @click="addSerialNumber">添加序列号</span>
+            <el-icon size="74" color="#08B7B8" style="margin-left: 20px;cursor: pointer;" @click="addSerialNumber">
+              <CirclePlus/>
+            </el-icon>
+          </div>
+          <div v-for="(item,index) in serialNumberList" :key="index">
+            <el-form-item label="序列号名称">
+              <div style="flex: 1;display: flex;">
+                <el-input v-model="item.serialNumberType" placeholder="请输入序列号名称"/>
+                <!--                <el-icon size="74" color="#08B7B8" style="margin-left: 20px;cursor: pointer" @click="addSerialNumber"-->
+                <!--                         v-if="index===0">-->
+                <!--                  <CirclePlus/>-->
+                <!--                </el-icon>-->
+                <el-icon size="74" color="#08B7B8" style="margin-left: 20px;cursor: pointer"
+                         @click="delSerialNumber(index)">
+                  <Remove/>
+                </el-icon>
+              </div>
+            </el-form-item>
+            <el-form-item :label="item.serialNumberType+'序列号'" class="serialNumber-name-overflow-hidden">
+              <el-input v-model="item.serialNumber" :placeholder="'请输入'+item.serialNumberType+'序列号'"
+                        style="margin-right: 94px"/>
+            </el-form-item>
+          </div>
+        </div>
+        <!--                <div style="display: flex;flex-direction: column">-->
+        <!--                  <div v-for="(item,index) in serialNumberList" :key="index" >-->
+        <!--                    <el-form-item :label="'序列号'+(index+2)">-->
+        <!--                      <div style="flex: 1;display: flex;">-->
+        <!--                        <el-input v-model="item.serialNumber" :placeholder="'请输入序列号'+(index+2)" />-->
+        <!--                        <el-icon size="74" color="#08B7B8" style="margin-left: 20px;cursor: pointer" @click="addSerialNumber" v-if="index===0">-->
+        <!--                          <CirclePlus/>-->
+        <!--                        </el-icon>-->
+        <!--                        <el-icon v-else size="74" color="#08B7B8" style="margin-left: 20px;cursor: pointer" @click="delSerialNumber(index)" >-->
+        <!--                          <Remove/>-->
+        <!--                        </el-icon>-->
+        <!--                      </div>-->
+        <!--                    </el-form-item>-->
+        <!--                  </div>-->
+        <!--                </div>-->
         <el-form-item label="隧道长度" prop="totalLength">
           <el-input type="number" v-model="form.totalLength" placeholder="请输入隧道长度"/>
         </el-form-item>
@@ -190,7 +225,8 @@ import {debounce} from 'lodash'
 
 const serialNumberList = ref([
   {
-    serialNumberOne: ''
+    serialNumber: '',
+    serialNumberType: ''
   }
 ])
 
@@ -203,7 +239,7 @@ const validateSerialNumberPrefix = (rule, value) => {
 }
 const router = useRouter()
 const siteImage = ref()
-const showAddIcon = ref(true)
+const showAddIcon = ref(false)
 const params = router.currentRoute.value.params;
 const siteId = reactive(params.siteId)
 const userId = reactive(params.userId)
@@ -220,7 +256,7 @@ const formRules = ref({
     {required: true, message: '请输入PLC序列号', trigger: ['blur', 'change']},
     {validator: validateNumber, message: '请输入英文、数字、英文数字组合的PLC序列号', trigger: ['blur', 'change']},
     {min: 16, max: 16, message: '隧道PLC序列号长度为16位', trigger: ['blur', 'change']},
-    // {validator: validateSerialNumberPrefix, message: '同一隧道的序列号前缀需相同', trigger: ['blur', 'change']}
+    {validator: validateSerialNumberPrefix, message: '同一隧道的序列号前缀需相同', trigger: ['blur', 'change']}
   ],
   serialNumberOne: [
     // {required: true, message: '请输入序列号2', trigger: ['blur', 'change']},
@@ -237,7 +273,7 @@ const formRules = ref({
   dropFrequency: [{required: true, message: '请输入降频率', trigger: ['blur', 'change']}]
 })
 let clickModel = ref(1)
-const showFirst = ref(true)
+const showFirst = ref(false)
 const showOperation = ref(true)
 const formInstance = ref()
 const tunnelList = ref([])
@@ -313,14 +349,14 @@ const form = ref({
   tunnelName: '',
   tunnelAlias: '',
   serialNumberPrefix: '',
-  serialNumberOne: '',
   serialNumber: '',
+  // serialNumberOne: '',
   totalLength: '',
   referenceFrequency: '',
-  upTime: '',
+  upTime: 0,
   upFrequency: '',
-  dropTime: '',
-  dropFrequency: '',
+  dropTime: 0,
+  dropFrequency: 0,
   remarks: '',
   isDefault: false
 });
@@ -329,13 +365,14 @@ const pageInfo = reactive({
   pageNum: 1,
   pageSize: 12
 });
-const total = ref(10);
+const total = ref(0);
 onMounted(() => {
   showOperation.value = localStorage.getItem('roleKey') !== 'tunnel_admin';
 })
 const addSerialNumber = () => {
   serialNumberList.value.push({
-    serialNumberOne: ''
+    serialNumber: '',
+    serialNumberType: '',
   })
 }
 const delSerialNumber = (index) => {
@@ -404,7 +441,8 @@ const getList = () => {
     if (res.code === 1000) {
       total.value = res.data.total
       tunnelList.value = res.data.rows
-      showFirst.value = total.value / pageInfo.pageSize >= 1;
+      showFirst.value = (total.value / pageInfo.pageSize) > 1;
+      showAddIcon.value = (total.value / pageInfo.pageSize) == 1;
       // siteName.value = res.data.siteName
     } else {
       ElMessage.warning(res.msg)
@@ -427,15 +465,18 @@ const handleCurrentChange = (val) => {
   getList()
 }
 const handleSubmit = debounce((instance) => {
-  let serialNumberListParam=serialNumberList.value.map(item=>item.serialNumberOne)
+  if (serialNumberList.value?.length > 0 && !serialNumberList.value[0].serialNumber&& !serialNumberList.value[0].serialNumberType) {
+    serialNumberList.value = []
+  }
   if (!instance) return
   instance.validate(async (valid) => {
     if (!valid) return
     const data = {
       siteId: siteId,
       ...form.value,
-      serialNumberList:serialNumberListParam
+      tunnelGatewayDtoList: serialNumberList.value
     }
+    console.info("🚀 ~method:data -----", data)
     addTunnel(data).then(res => {
       if (res.code === 1000) {
         ElMessage.success('新增成功')
@@ -449,7 +490,6 @@ const handleSubmit = debounce((instance) => {
 }, 100)
 //预览隧道
 const handlePreview = (id) => {
-  console.log('预览')
   if (id) {
     getTunnelBySiteId(siteId).then((res) => {
       if (res?.code === 1000) {
@@ -498,9 +538,9 @@ const restFrom = () => {
     serialNumber: '',
     totalLength: '',
     referenceFrequency: '',
-    upTime: '',
+    upTime: 0,
     upFrequency: '',
-    dropTime: '',
+    dropTime: 0,
     dropFrequency: '',
     remarks: '',
     isDefault: false
@@ -510,6 +550,12 @@ const handleAdd = () => {
   restFrom()
   title.value = '新增隧道'
   isVisited.value = true
+  serialNumberList.value = [
+    // {
+    //   serialNumber: '',
+    //   serialNumberType:''
+    // }
+  ]
   nextTick(() => {
     // 清空校验
     formInstance.value.clearValidate()
@@ -562,6 +608,10 @@ const handleMoreDelete = debounce(() => {
 </script>
 
 <style scoped lang="scss">
+.serialNumber-name-overflow-hidden {
+
+}
+
 .showNull {
   margin-top: 150px;
   font-size: 60px;
@@ -793,13 +843,20 @@ const handleMoreDelete = debounce(() => {
     margin: 100px;
   }
 
+  .box-content::after {
+    content: '';
+    flex: 0.65;
+    justify-content: flex-end;
+  }
+
   .box-content {
     height: 1850px;
     display: flex;
     flex-wrap: wrap;
     padding-left: 67px;
-    padding-right: 70px;
-    //justify-content: space-between;
+    //padding-right: 70px;
+    align-content: flex-start;
+    justify-content: space-between;
     box-sizing: border-box;
     overflow: hidden;
 
@@ -835,10 +892,10 @@ const handleMoreDelete = debounce(() => {
       //&:hover {
       //  background-image: url('@/assets/images/tunnel/sdgl_bjtq.png');
       //}
-
-      &:nth-child(4n) {
-        margin-right: 0;
-      }
+      //
+      //&:nth-child(4n) {
+      //  margin-right: 0;
+      //}
 
       .top {
         display: flex;

From b2fd0bba85ab205d8719752a122942e8603fd1b9 Mon Sep 17 00:00:00 2001
From: odjbin <1042039504@qq.com>
Date: Mon, 26 Aug 2024 23:12:53 +0800
Subject: [PATCH 6/7] =?UTF-8?q?fix=20:=20=E4=BF=AE=E5=A4=8D=E6=B0=94?=
 =?UTF-8?q?=E4=BD=93=E5=B1=95=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/content/airInfo/AirInfo.vue | 16 +++++++++++-----
 src/views/debug/index.vue                  |  4 ++--
 2 files changed, 13 insertions(+), 7 deletions(-)

diff --git a/src/components/content/airInfo/AirInfo.vue b/src/components/content/airInfo/AirInfo.vue
index 5af5e27..94b3b54 100644
--- a/src/components/content/airInfo/AirInfo.vue
+++ b/src/components/content/airInfo/AirInfo.vue
@@ -324,7 +324,7 @@ const timeSelect = (index) => {
 const changeData = (item) => {
   return {
     equipmentId: item.equipmentId,
-    icon: changeIcon(item.equipmentType),
+    icon: changeIcon(item.equipmentType,item.equipmentName),
     name: item.equipmentName.slice(0, 2),
     max: item.maxRange,
     value: item.value,
@@ -332,7 +332,7 @@ const changeData = (item) => {
     unit: item.unit
   }
 }
-const changeIcon = (type) => {
+const changeIcon = (type,name) => {
   switch (type) {
     case "oxygen":
       return 'o2-icon.png';
@@ -340,6 +340,12 @@ const changeIcon = (type) => {
       return 'tempture-icon.png';
     case "humidness":
       return 'water-icon.png';
+    case "humiture":
+      if(name==='温度传感器'){
+        return 'tempture-icon.png';
+      }else if(name==='湿度传感器'){
+        return 'water-icon.png';
+      }
   }
 }
 const getAirInfo = (now) => {
@@ -347,15 +353,15 @@ const getAirInfo = (now) => {
   let airObj = {}
   let airArr = []
   now?.map(item => {
-    if (item.equipmentType === "oxygen" || item.equipmentType === "temperature" || item.equipmentType === "humidness") {
+    if (item.equipmentType === "oxygen" || item.equipmentType === "temperature" || item.equipmentType === "humidness"|| item.equipmentType === "humiture") {
       airObj = changeData(item)
       airArr.push(airObj)
-    } else if (item.equipmentType === "windSpeed") {
+    } else if (item.equipmentType === "windSpeed"||item.equipmentName==="风速传感器") {
       windSpeedType.value = item.equipmentType
       windSpeedId.value = item.equipmentId
       windSpeed.value = item.value
       windSpeedUnit.value = item.unit
-    } else if (item.equipmentType === "windDirection") {
+    } else if (item.equipmentType === "windDirection"||item.equipmentName==="风向传感器") {
       windDirectionSpeedType.value = item.equipmentType
       windDirectionSpeedId.value = item.equipmentId
       windDirection.value = item.value
diff --git a/src/views/debug/index.vue b/src/views/debug/index.vue
index 740f05e..6e008f1 100644
--- a/src/views/debug/index.vue
+++ b/src/views/debug/index.vue
@@ -75,8 +75,8 @@ const handleSend = () => {
 }
 const initWebSocket = () => {
   // let wsUrl = `ws://192.168.31.176:9000/websocket/debug/${token}/${serialNumber.value}`
-  let wsUrl = import.meta.env.VITE_BASE_WSURL+`/${token}/${serialNumber.value}`;
-  // let wsUrl = `ws://web-tunnel.feashow.com/api/wstunnel/websocket/debug/${token}/${serialNumber.value}`
+  // let wsUrl = import.meta.env.VITE_BASE_WSURL+`/${token}/${serialNumber.value}`;
+  let wsUrl = `ws://web-tunnel.feashow.com/api/wstunnel/websocket/debug/${token}/${serialNumber.value}`
   console.log(wsUrl)
   socket = new WebSocket(wsUrl)
   //连接发生错误的回调方法

From e4f8d488384ed93796f6f7a75eb459a000c95c04 Mon Sep 17 00:00:00 2001
From: odjbin <1042039504@qq.com>
Date: Mon, 26 Aug 2024 23:22:21 +0800
Subject: [PATCH 7/7] =?UTF-8?q?fix=20:=20=E4=BF=AE=E5=A4=8D=E8=AE=BE?=
 =?UTF-8?q?=E5=A4=87=E7=AE=A1=E7=90=86=E5=BA=8F=E5=88=97=E5=8F=B7=E5=B1=95?=
 =?UTF-8?q?=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/device-manage/index.vue | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/src/views/device-manage/index.vue b/src/views/device-manage/index.vue
index 0f3d835..d80540a 100644
--- a/src/views/device-manage/index.vue
+++ b/src/views/device-manage/index.vue
@@ -171,7 +171,7 @@
                         :label="item.label"
                         :value="item.value"
                         :disabled="serialNumberOptionDisabled(item)"
-                        :title="serialNumberOptionDisabled(item)?'该4G序列号已选择':''"
+                        :title="serialNumberOptionDisabled(item)?'该序列号已选择!':''"
                     />
                   </el-select>
                 </template>
@@ -394,12 +394,14 @@ const clearWinDataSelectedOption=()=>{
   winDataSelectedOption.value=[]
 }
 const changeWindDataSerialNumber = (value,options) => {
+  console.info("🚀 ~method:changeWindDataSerialNumber -----", value,options)
   options?.forEach(item=>{
     if(item.value==value){
-      if(item.label.indexOf('4G')>=0){
-        winDataSelectedOption.value.push(value)
-      }else{
+      console.info("🚀 ~method:item.label -----", item.label)
+      if(item.label.indexOf('PLC')>=0){
         winDataSelectedOption.value=[]
+      }else{
+        winDataSelectedOption.value.push(value)
       }
     }
   })