From d5a316e925b68718316c467c9380bc394fb9e117 Mon Sep 17 00:00:00 2001
From: fhysy <1149505133@qq.com>
Date: Fri, 25 Oct 2024 16:55:09 +0800
Subject: [PATCH] =?UTF-8?q?=20fast(=E5=9E=8B=E5=8F=B7):=20=E8=B0=83?=
 =?UTF-8?q?=E6=95=B4=E5=9E=8B=E5=8F=B7=E5=88=97=E8=A1=A8=E8=AE=BE=E5=A4=87?=
 =?UTF-8?q?=E7=B1=BB=E5=9E=8B=E3=80=81=E9=80=89=E6=8B=A9=E5=9E=8B=E5=8F=B7?=
 =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E4=BA=A7=E5=93=81pk=E5=8F=82=E6=95=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/iot/model/index.vue | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/src/views/iot/model/index.vue b/src/views/iot/model/index.vue
index 45933a56..948fc0f9 100644
--- a/src/views/iot/model/index.vue
+++ b/src/views/iot/model/index.vue
@@ -116,12 +116,12 @@
       <el-table-column
         align="center"
         label="设备类型"
-        prop="deviceType"
+        prop="deviceTypeName"
         width="120px"
       >
-        <template slot-scope="scope">
-          <span v-text="deviceTypeList[scope.row.deviceType]"></span>
-        </template>
+<!--        <template slot-scope="scope">-->
+<!--          <span v-text="deviceTypeList[scope.row.deviceType]"></span>-->
+<!--        </template>-->
       </el-table-column>
 
       <el-table-column
@@ -842,6 +842,7 @@ export default {
     },
     // 点击或者双击数据回调
     returnEvent(data) {
+      console.log('弹窗回调',data)
       this.selectResult = {};
       if (data.type === "dblclick") {
         switch(data.otherOption.tableType) {
@@ -859,6 +860,7 @@ export default {
             this.form.prodJson = data.value.prodJson;
             this.form.remark = data.value.remark;
             this.form.deviceType = data.value.deviceType;
+            this.form.seriesKey = data.value.prodKey;
             try {
               this.form.paramList = JSON.parse(data.value.paramJson);
             } catch (error) {
@@ -893,6 +895,7 @@ export default {
             this.selectResult.prodJson = data.value.prodJson;
             this.selectResult.remark = data.value.remark;
             this.selectResult.deviceType = data.value.deviceType;
+            this.selectResult.seriesKey = data.value.deviceType;
             try {
               this.selectResult.paramList = JSON.parse(data.value.paramJson);
             } catch (error) {
@@ -960,6 +963,7 @@ export default {
         paramList: [],
         protocolType: "OFFICIAL",
         prodJson: "",
+        seriesKey:""
       };
       this.resetForm("form");
     },