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] =?UTF-8?q?fix=20:=20=E6=B3=A8=E9=87=8A=E5=BA=8F=E5=88=97?=
 =?UTF-8?q?=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>