From 19a8861d3c847b95fd185f584f97f63062771465 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=AB=98=E4=BA=91=E9=B9=8F?= <ypgaop@isoftstone.com>
Date: Wed, 7 Aug 2024 17:40:20 +0800
Subject: [PATCH] =?UTF-8?q?=E9=80=9A=E8=AE=AF=E9=93=BE=E8=B7=AF=EF=BC=9Aex?=
 =?UTF-8?q?cel=E4=BF=AE=E6=94=B9=E9=80=BB=E8=BE=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 ui/dasadmin/src/views/backend/node/univer.vue | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/ui/dasadmin/src/views/backend/node/univer.vue b/ui/dasadmin/src/views/backend/node/univer.vue
index c88eb312..5691fc29 100644
--- a/ui/dasadmin/src/views/backend/node/univer.vue
+++ b/ui/dasadmin/src/views/backend/node/univer.vue
@@ -72,7 +72,7 @@
                     <el-tree :data="correctionDevice" :props="repalceDeviceTreeKey" node-key="id" draggable :allow-drop="dropJudge">
                         <template #default="{ node, data }">
                             <div class="correctionTreeItem">
-                                <span>{{ correctionDevice.findIndex((item: any) => item.id === node.key) + 1 + '、' + data.name }}</span>
+                                <span>{{ correctionDevice.findIndex((item) => item === data) + 1 + '、' + data.name }}</span>
                                 <div class="rightItem">
                                     <el-input v-if="data.isEdit" v-model="data.iotAddr" @keyup.enter="okEdit(data)" @blur="okEdit(data)"></el-input>
                                     <el-tag v-else type="info" @click="editAttr(data)">{{ data.iotAddr }}</el-tag>
@@ -183,6 +183,8 @@ const init = async () => {
     const sheetData = createSheetData(reqSheetData, 12)
     const data = createWookbookData(route.query.protocol as any, route.query.id as string, sheetData)
     initExcel(data)
+    getTreeDataType()
+    getBindDeviceTree()
 }
 
 const initExcel = (data = {}) => {
@@ -330,14 +332,15 @@ const okEdit = (data: any) => {
     data.isEdit = false
 }
 const submitcorrectionDevice = () => {
-    const bindDeviceId = correctionDevice.value.map((item: any) => {
+    const bindDevice = correctionDevice.value.map((item: any, index) => {
         return {
             equipmentId: item.id,
             iotAddr: item.iotAddr,
+            porder: index + 1,
         }
     })
 
-    bindDeviceMeasReq({ equipmentId: bindDeviceId, linkId: route.query.id }).then((res) => {
+    bindDeviceMeasReq({ equipmentId: bindDevice, linkId: route.query.id }).then((res) => {
         ElMessage.success('关联成功！')
         closecorrectionDevice()
     })
@@ -378,6 +381,7 @@ const getBindDeviceTree = () => {
                     id: item.equipmentId,
                     name: item.equipmentName,
                     iotAddr: item.iotAddr,
+                    porder: item.porder,
                 }
             })
         }
@@ -472,8 +476,6 @@ const goToNodePage = () => {
 
 onMounted(() => {
     init()
-    getTreeDataType()
-    getBindDeviceTree()
 })
 
 onBeforeUnmount(() => {