From 80952ac7f44b6b6d47208ccbecb3c5cc9befb29e Mon Sep 17 00:00:00 2001
From: geting <13585118195@163.com>
Date: Fri, 17 Jan 2025 09:52:57 +0800
Subject: [PATCH] =?UTF-8?q?bugfixed:=E6=B7=BB=E5=8A=A0=E9=AB=98=E9=A2=91?=
 =?UTF-8?q?=E9=80=89=E9=A1=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../statAnalysis/analysisAttributes.vue       | 39 ++++++++++++++++---
 .../backend/statAnalysis/trendComparison.vue  | 36 +++++++++--------
 2 files changed, 53 insertions(+), 22 deletions(-)

diff --git a/ui/dasadmin/src/views/backend/statAnalysis/analysisAttributes.vue b/ui/dasadmin/src/views/backend/statAnalysis/analysisAttributes.vue
index 9b855d10..b75d95a7 100644
--- a/ui/dasadmin/src/views/backend/statAnalysis/analysisAttributes.vue
+++ b/ui/dasadmin/src/views/backend/statAnalysis/analysisAttributes.vue
@@ -1,11 +1,20 @@
 <template>
     <div class="measurement">
         <div class="transferHeader">
-            <span class="transferTitle">可添加的测点</span>
-            <el-radio-group v-model="radioActiveName" @change="typeChange">
-                <el-radio :value="138">模拟量</el-radio>
-                <el-radio :value="199">计算量</el-radio>
-            </el-radio-group>
+            <div class="pointDialogColTitleInput">
+                <span class="transferTitle">可添加的测点</span>
+                <el-input v-model="inputValue" clearable @keyup.enter="typeChange"></el-input>
+                <el-button type="primary" @click="typeChange">查询</el-button>
+            </div>
+            <div class="radios">
+                <span style="margin-right: 10px">是否高频数据</span>
+                <el-switch style="margin-right: 24px" v-model="highSpeed" @change="typeChange" />
+
+                <el-radio-group v-model="radioActiveName" @change="typeChange">
+                    <el-radio :value="138">模拟量</el-radio>
+                    <el-radio :value="199">计算量</el-radio>
+                </el-radio-group>
+            </div>
         </div>
         <div class="main">
             <el-table :columns="tableColumn" :data="tableData" max-height="420">
@@ -70,6 +79,8 @@ const props = defineProps({
 })
 
 const radioActiveName = ref(138)
+const inputValue = ref('')
+const highSpeed = ref(false)
 const typeChange = () => {
     pageSetting.current == 1 ? getCompleteData() : (pageSetting.current = 1)
 }
@@ -120,6 +131,8 @@ const getAttributeList = () => {
         pageNum: pageSetting.current,
         pageSize: pageSetting.pageSize,
         attributeType: radioActiveName.value,
+        highSpeed: highSpeed.value ? 1 : 0,
+        attributeName: inputValue.value,
     }
     return new Promise((resolve) => {
         getModelAttributeListReq(requestData)
@@ -163,8 +176,10 @@ watch(
     () => props.show,
     (newVal) => {
         if (newVal) {
-            pageSetting.current == 1 ? getCompleteData() : (pageSetting.current = 1)
             selectedIndex.value = props.irn
+            inputValue.value = ''
+            highSpeed.value = false
+            pageSetting.current == 1 ? getCompleteData() : (pageSetting.current = 1)
         }
     },
     {
@@ -187,6 +202,18 @@ watch(
         background: #f7f9fc;
         border-bottom: 1px solid #e1edf6;
         border-radius: 6px 6px 0 0;
+        .pointDialogColTitleInput {
+            .el-input {
+                width: 180px;
+            }
+            .el-button {
+                margin-left: 10px;
+            }
+        }
+        .radios {
+            display: flex;
+            align-items: center;
+        }
     }
     .main {
         padding: 10px;
diff --git a/ui/dasadmin/src/views/backend/statAnalysis/trendComparison.vue b/ui/dasadmin/src/views/backend/statAnalysis/trendComparison.vue
index 65c82070..20c46535 100644
--- a/ui/dasadmin/src/views/backend/statAnalysis/trendComparison.vue
+++ b/ui/dasadmin/src/views/backend/statAnalysis/trendComparison.vue
@@ -494,6 +494,8 @@ const intervalChange = (val: any) => {
 const tableDataLeftRef = ref()
 const openMeasure = () => {
     showMeasure.value = true
+    highSpeed.value = false
+    inputValue.value = ''
     pageSetting.current = 1
     getCompleteData()
     selectedLeft.value = JSON.parse(JSON.stringify(submitParams.selectedLeft))
@@ -629,8 +631,12 @@ const handleRes = (res: any, selectAllDevices: any) => {
                             lowSpeedExoprtData.value.push(dataItem.join(','))
                         })
                     }
-                    highcsvContent.value = highSpeedExoprtHeader.value + '\n' + highSpeedExoprtData.value.join('\n')
-                    lowcsvContent.value = lowSpeedExoprtHeader.value + '\n' + lowSpeedExoprtData.value.join('\n')
+                    highcsvContent.value = highSpeedExoprtData.value.length
+                        ? highSpeedExoprtHeader.value + '\n' + highSpeedExoprtData.value.join('\n')
+                        : []
+                    lowcsvContent.value = lowSpeedExoprtData.value.length
+                        ? lowSpeedExoprtHeader.value + '\n' + lowSpeedExoprtData.value.join('\n')
+                        : []
                     if (!yData.length) {
                         ElMessage.info(`${deviceName + attName}数据为空`)
                         return
@@ -695,20 +701,18 @@ const statAnalysisExport = () => {
 
     tables.forEach((table) => {
         const csvContent = table.data
-
-        // 创建Blob对象
-        const blob = new Blob([csvContent], { type: 'text/csv;charset=utf-8;' })
-
-        // 创建下载链接并触发下载
-        const link = document.createElement('a')
-        if (link.download !== undefined) {
-            const url = URL.createObjectURL(blob)
-            link.setAttribute('href', url)
-            link.setAttribute('download', table.filename)
-            link.style.visibility = 'hidden'
-            document.body.appendChild(link)
-            link.click()
-            document.body.removeChild(link)
+        if (csvContent.length) {
+            const blob = new Blob([csvContent], { type: 'text/csv;charset=utf-8;' })
+            const link = document.createElement('a')
+            if (link.download !== undefined) {
+                const url = URL.createObjectURL(blob)
+                link.setAttribute('href', url)
+                link.setAttribute('download', table.filename)
+                link.style.visibility = 'hidden'
+                document.body.appendChild(link)
+                link.click()
+                document.body.removeChild(link)
+            }
         }
     })
 }