From e7bec03ab5c98ad735a40f458ed529b3c93a20c0 Mon Sep 17 00:00:00 2001
From: zhujiyan <17812234322@163.com>
Date: Thu, 26 Sep 2024 16:45:24 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9A=82=E6=80=81=E4=BA=8B=E4=BB=B6lineId?=
 =?UTF-8?q?=E5=8F=82=E6=95=B0=E9=97=AE=E9=A2=98=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/govern/device/control/index.vue | 19 +++++++------------
 1 file changed, 7 insertions(+), 12 deletions(-)

diff --git a/src/views/govern/device/control/index.vue b/src/views/govern/device/control/index.vue
index 75acb8f..7f38b44 100644
--- a/src/views/govern/device/control/index.vue
+++ b/src/views/govern/device/control/index.vue
@@ -80,7 +80,6 @@
                 <el-form
                     :inline="true"
                     style="white-space: nowrap; margin-top: 10px"
-                    id="formRef"
                     v-if="
                         dataSet.indexOf('_trenddata') == -1 &&
                         dataSet.indexOf('_realtimedata') == -1 &&
@@ -109,9 +108,7 @@
                             <el-option value="Secondary" label="二次值"></el-option>
                         </el-select>
                     </el-form-item>
-                    <el-form-item>
-                        <el-button type="primary" icon="el-icon-Search" @click="handleClick">查询</el-button>
-                    </el-form-item>
+                    <el-button type="primary" icon="el-icon-Search" @click="handleClick">查询</el-button>
                 </el-form>
                 <div
                     style="height: calc(100vh - 300px)"
@@ -330,6 +327,7 @@ const devTypeOptions = ref([])
 const devModelOptions = ref([])
 const tableData = ref<any[]>([])
 
+const tableHeight = mainHeight(330).height
 const mangePopup = ref()
 const datePickerRef = ref()
 const formInline = reactive({
@@ -492,8 +490,6 @@ const timer: any = ref()
 //tab点击事件
 const handleClick = async (tab?: any) => {
     tableLoading.value = true
-    // formInline.dataLevel = 'Secondary'
-    // loading.value = true
     //点击tab时更新dataSet最新值
     if (tab && tab.props && tab.props.name && dataSet.value != tab.props.name) {
         dataSet.value = tab.props.name
@@ -541,7 +537,9 @@ const handleClick = async (tab?: any) => {
                     lineId: lineId.value,
                     devId: dataSet.value.replace('_trenddata', '')
                 }
-            ]
+            ],
+            // startTime: datePickerRef.value && datePickerRef.value.timeValue[0],
+            // endTime: datePickerRef.value && datePickerRef.value.timeValue[1]
         }
         setTimeout(() => {
             trendRef.value && trendRef.value.getTrendRequest(obj)
@@ -575,9 +573,9 @@ const handleClick = async (tab?: any) => {
                 }
             ]
         }
+        setTimeout(() => {
         //暂态事件表格请求参数
         eventRef.value && eventRef.value.getTableParams(obj)
-        setTimeout(() => {
             tableLoading.value = false
         }, 1500)
     }
@@ -662,11 +660,8 @@ const openGroup = () => {
         })
     })
 }
-const tableHeight = mainHeight(330).height
 
-onMounted(() => {
-
-})
+onMounted(() => {})
 </script>
 
 <style lang="scss">