From 2ed728ee71cda45fe7663a7d3dad7ecbb1a7589c Mon Sep 17 00:00:00 2001
From: GGJ <357021191@qq.com>
Date: Mon, 2 Dec 2024 09:14:28 +0800
Subject: [PATCH] =?UTF-8?q?=E6=95=B0=E6=8D=AE=E7=B1=BB=E5=9E=8B-=E6=95=B0?=
 =?UTF-8?q?=E6=8D=AE=E7=B1=BB=E5=9E=8B=E6=B7=BB=E5=8A=A0conType=E5=AD=97?=
 =?UTF-8?q?=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/govern/device/control/index.vue            | 6 ++++--
 src/views/govern/device/control/nearRealTimeData.vue | 2 +-
 src/views/govern/setting/statisticalType/binding.vue | 9 ++++++++-
 3 files changed, 13 insertions(+), 4 deletions(-)

diff --git a/src/views/govern/device/control/index.vue b/src/views/govern/device/control/index.vue
index aedb960..3a3f252 100644
--- a/src/views/govern/device/control/index.vue
+++ b/src/views/govern/device/control/index.vue
@@ -101,7 +101,7 @@
                             <el-input style="width: 160px" v-model="searchValue" autocomplete="off" clearable
                                 @input="handleSearch" placeholder="请输入关键词"></el-input>
                         </el-form-item>
-                        <el-form-item label="谐波次数" v-if="oddAndEvenFlag && !dataSet.includes('_')">
+                        <el-form-item label="谐波次数" v-show="oddAndEvenFlag && !dataSet.includes('_')">
                             <el-select v-model="oddAndEven" style="min-width: 120px !important">
                                 <el-option v-for="item in oddAndEvenList" :key="item.value" :label="item.label"
                                     :value="item.value" />
@@ -631,9 +631,11 @@ const deviceId: any = ref('')
 const lineId: any = ref('')
 const dataLevel: any = ref('')
 const nodeClick = async (e: anyObj) => {
+    console.log("🚀 ~ nodeClick ~ e:", e)
     searchValue.value = ''
     await queryDictType({
-        lineId: e?.id
+        lineId: e?.id,
+        conType: e.conType
     }).then(res => {
         oddAndEvenFlag.value = false
         queryList.value = res.data
diff --git a/src/views/govern/device/control/nearRealTimeData.vue b/src/views/govern/device/control/nearRealTimeData.vue
index ed88887..47742d6 100644
--- a/src/views/govern/device/control/nearRealTimeData.vue
+++ b/src/views/govern/device/control/nearRealTimeData.vue
@@ -9,7 +9,7 @@
         <vxe-table v-if="flag1" auto-resize :data="dataList1" 
             v-bind="defaultAttribute" :key="key" :mergeCells="mergeCells">
             <vxe-column field="otherName" title="名称" width="350"></vxe-column>
-            <vxe-column field="valueM" title="其他数据"></vxe-column>
+            <vxe-column field="valueM" title="数据"></vxe-column>
 
         </vxe-table>
         <el-empty :style="height" description="暂无数据"v-if="!flag && !flag1" ></el-empty>
diff --git a/src/views/govern/setting/statisticalType/binding.vue b/src/views/govern/setting/statisticalType/binding.vue
index 066027a..c4ebd52 100644
--- a/src/views/govern/setting/statisticalType/binding.vue
+++ b/src/views/govern/setting/statisticalType/binding.vue
@@ -1,6 +1,6 @@
 <template>
     <el-dialog class="cn-operate-dialog statistical-type-binding" v-model="dialogVisible" title="绑定指标"
-        style="width: 1040px" @closed="close">
+        style="width: 1200px" @closed="close">
         <el-scrollbar style="padding-right: 0">
             <div class="box">
                 <div class="box-left">
@@ -450,6 +450,13 @@ defineExpose({ open })
                 }
             }
         }
+
+        .hide-txt {
+            width: 150px;
+            white-space: nowrap;
+            overflow: hidden;
+            text-overflow: ellipsis;
+        }
     }
 }
 </style>