From a9f0e10a8a9f3ab62a57dcad85b238278221bb84 Mon Sep 17 00:00:00 2001
From: dawnwinterLiu <1737801684@qq.com>
Date: Tue, 23 Aug 2022 19:42:04 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20=E4=BF=AE=E6=94=B9=E4=BB=BB=E5=8A=A1id?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/CloudFunction/engine/channel.vue |  2 +-
 src/views/CloudTest/js/task.js             | 17 +++++++++--------
 2 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/src/views/CloudFunction/engine/channel.vue b/src/views/CloudFunction/engine/channel.vue
index a4db16dcfb..a318936e08 100644
--- a/src/views/CloudFunction/engine/channel.vue
+++ b/src/views/CloudFunction/engine/channel.vue
@@ -37,7 +37,7 @@
         @onChange="onChange"
       />
     </el-drawer>
-    <dgiot-input ref="uploadFinish" @fileInfo="fileInfo" />
+    <dgiot-input ref="uploadFinish" accept=".csv" @fileInfo="fileInfo" />
     <div class="firsttable">
       <el-form
         class="demo-form-inline"
diff --git a/src/views/CloudTest/js/task.js b/src/views/CloudTest/js/task.js
index 89a19c3259..397699f131 100644
--- a/src/views/CloudTest/js/task.js
+++ b/src/views/CloudTest/js/task.js
@@ -222,10 +222,12 @@ export default {
           const { data = [] } = JSON.parse(Base64.decode(mqttMsg.payloadString))
           this.renderCard(data)
           // 刷新存储数据
-          getDevice(params.objectId).then((res) => {
-            this.historyEvidence = res.profile.historicaldata
-            this.drawxnqxPath = res.profile.drawxnqxPath
-          })
+          if (params.profile.istcp) {
+            getDevice(params.objectId).then((res) => {
+              this.historyEvidence = res.profile.historicaldata
+              this.drawxnqxPath = res.profile.drawxnqxPath
+            })
+          }
           if (data) {
             this.collectiontable(data)
             // this.renderCard(data)
@@ -446,8 +448,7 @@ export default {
       this.historyEvidence = []
       try {
         const params = {
-          order: '-createdAt',
-          skip: 0,
+          limit: 1,
           where: {
             'original.taskid': taskid,
             'original.type': 'avgs',
@@ -871,7 +872,7 @@ export default {
         const pubTopic = `$dg/thing/${row.parentId.objectId}/properties/get/request_id=opc_items` // 读取opc属性topic
         const message = {
           cmd: 'opc_items',
-          groupid: row.parentId.objectId, //'设备ID',
+          groupid: row.objectId, //'任务ID',
           opcserver:
             basedata.dgiot_testing_opcserver ?? 'Kepware.KEPServerEX.V6',
           items: items, //要读取到属性列表
@@ -917,7 +918,7 @@ export default {
         const message = {
           cmd: 'opc_report', // 采集条数
           duration: Number(basedata.dgiot_sampling_parametric_frequency) ?? 5, //条数
-          groupid: params.parentId.objectId,
+          groupid: params.objectId,
         }
         console.groupCollapsed(
           `%c 发送采集消息`,