From 8e832298ecfa094684eb032df4c595b3424d4a37 Mon Sep 17 00:00:00 2001
From: fhysy <1149505133@qq.com>
Date: Wed, 20 Nov 2024 14:23:29 +0800
Subject: [PATCH] =?UTF-8?q?fix(=E7=BD=91=E5=85=B3=E8=B0=83=E8=AF=95):=20?=
 =?UTF-8?q?=E5=88=9D=E5=A7=8B=E5=8C=96=E5=88=B7=E6=96=B0table=E5=AE=BD?=
 =?UTF-8?q?=E5=BA=A6=EF=BC=8C=E8=A7=A3=E5=86=B3=E5=AF=BC=E5=87=BA=E8=A1=A8?=
 =?UTF-8?q?=E6=A0=BC=E9=94=99=E8=AF=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/views/gateway/collectdatamonitor.vue  |  2 +-
 .../src/views/gateway/northboundtask.vue      |  1 +
 .../src/views/gateway/southdirection.vue      | 19 +++++++++++++------
 3 files changed, 15 insertions(+), 7 deletions(-)

diff --git a/src/renderer/src/views/gateway/collectdatamonitor.vue b/src/renderer/src/views/gateway/collectdatamonitor.vue
index 1543c4d..0e8182d 100644
--- a/src/renderer/src/views/gateway/collectdatamonitor.vue
+++ b/src/renderer/src/views/gateway/collectdatamonitor.vue
@@ -229,7 +229,7 @@ onMounted(() => {
     activeDeviceConfig.value = deviceConfigList.value[0].dataList;
     ActiveRowIndex.value = 0;
   }
-
+  handleResize()
 });
 onUnmounted(() => {
   window.removeEventListener('resize', handleResize);
diff --git a/src/renderer/src/views/gateway/northboundtask.vue b/src/renderer/src/views/gateway/northboundtask.vue
index 0287811..5d1d017 100644
--- a/src/renderer/src/views/gateway/northboundtask.vue
+++ b/src/renderer/src/views/gateway/northboundtask.vue
@@ -782,6 +782,7 @@ const handleResize = () => {
 onMounted(() => {
   window.addEventListener('resize', handleResize);
   getDeviceConfig()
+  handleResize()
   // if(platConfigList.value[0]){
   //   activeDeviceConfig.value = platConfigList.value[0];
   //   platConfigTableRef.value.toggleRowSelection(platConfigList.value[0]);
diff --git a/src/renderer/src/views/gateway/southdirection.vue b/src/renderer/src/views/gateway/southdirection.vue
index f0e7cc8..5e924ae 100644
--- a/src/renderer/src/views/gateway/southdirection.vue
+++ b/src/renderer/src/views/gateway/southdirection.vue
@@ -205,18 +205,18 @@
               </el-select>
             </template>
           </el-table-column>
-          <el-table-column prop="driveFlag.isConclude_R" label="快读" width="50" align="center">
+          <el-table-column prop="driveFlag.isConclude_R" label="块读" width="50" align="center">
             <template #default="scope">
-<!--              <el-select v-model="scope.row.driveFlag.isConclude_R" placeholder="请选择快读">-->
+<!--              <el-select v-model="scope.row.driveFlag.isConclude_R" placeholder="请选择块读">-->
 <!--                <el-option value="true">Yes</el-option>-->
 <!--                <el-option value="false">No</el-option>-->
 <!--              </el-select>-->
               <el-switch v-model="scope.row.driveFlag.isConclude_R" />
             </template>
           </el-table-column>
-          <el-table-column prop="driveFlag.isConclude_W" label="快写" width="50" align="center">
+          <el-table-column prop="driveFlag.isConclude_W" label="块写" width="50" align="center">
             <template #default="scope">
-<!--              <el-select v-model="scope.row.driveFlag.isConclude_W" placeholder="请选择快写">-->
+<!--              <el-select v-model="scope.row.driveFlag.isConclude_W" placeholder="请选择块写">-->
 <!--                <el-option value="true">Yes</el-option>-->
 <!--                <el-option value="false">No</el-option>-->
 <!--              </el-select>-->
@@ -1080,6 +1080,12 @@ const exportDeviceConfigXlsx = () => {
       return {
         equipId: item.equipId,
         ...val,
+        isConclude_R:val.driveFlag.isConclude_R,
+        isConclude_W:val.driveFlag.isConclude_W,
+        offset:val.northCalcParam.offset,
+        proportion:val.northCalcParam.proportion,
+        numBits:val.northCalcParam.decimal.numBits,
+        way:val.northCalcParam.decimal.way,
         equipName: item.equipName,
         protocol: item.protocol.libName,
         link: item.interfaceParams.link,
@@ -1190,7 +1196,7 @@ const handleFileChange = (file, fileList) => {
               }
             })
             item.equipName = dataArr[0].equipName;
-            item.protocol.libName = dataArr[0].libName;
+            item.protocol.libName = dataArr[0].protocol;
             item.interfaceParams.link = dataArr[0].link;
             item.protocol.params.linkPar = dataArr[0].linkPar;
           }
@@ -1219,7 +1225,7 @@ const handleFileChange = (file, fileList) => {
             },
             "interfaceParams": { "link": dataArr[0].link, "physicalInterface": "" }, // 接口参数
             "properties": [],
-            "protocol": { "libName": dataArr[0].libName, "params": { "linkPar": dataArr[0].linkPar } } // 通信协议设置
+            "protocol": { "libName": dataArr[0].protocol, "params": { "linkPar": dataArr[0].linkPar } } // 通信协议设置
           }
           obj.properties = dataArr.map(val=>{
             return {
@@ -1261,6 +1267,7 @@ onMounted(() => {
   window.addEventListener('resize', handleResize);
   getDeviceConfig()
   getSerialPortList(false)
+  handleResize()
   // if(deviceConfigList.value[0]){
   //   activeDeviceConfig.value = deviceConfigList.value[0];
   //   deviceConfigTableRef.value.toggleRowSelection(deviceConfigList.value[0]);