From f4131c40af7e6092604d077d91cd3ec278727e96 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=AB=98=E4=BA=91=E9=B9=8F?= <ypgaop@isoftstone.com>
Date: Wed, 18 Dec 2024 10:43:55 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AE=9E=E6=97=B6=E6=95=B0=E6=8D=AE:=E6=B5=8B?=
 =?UTF-8?q?=E7=82=B9=E9=80=89=E6=8B=A9=E5=AD=90=E7=B3=BB=E7=BB=9F=E7=B1=BB?=
 =?UTF-8?q?=E5=9E=8B=E9=A1=BA=E5=BA=8F=E8=B0=83=E6=95=B4,=E6=9F=A5?=
 =?UTF-8?q?=E8=AF=A2=E6=B7=BB=E5=8A=A0=E7=89=A9=E6=A8=A1=E5=9E=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../backend/equipment/airBlower/index.vue     |  6 +++++-
 .../equipment/airBlower/realDataChart.vue     | 20 ++++++++++++-------
 .../equipment/airBlower/selectPoint.vue       | 14 +++++++------
 3 files changed, 26 insertions(+), 14 deletions(-)

diff --git a/ui/dasadmin/src/views/backend/equipment/airBlower/index.vue b/ui/dasadmin/src/views/backend/equipment/airBlower/index.vue
index 9a3eef35..077b9c36 100644
--- a/ui/dasadmin/src/views/backend/equipment/airBlower/index.vue
+++ b/ui/dasadmin/src/views/backend/equipment/airBlower/index.vue
@@ -184,7 +184,7 @@
             </el-row>
         </el-dialog>
         <el-dialog v-model="selectPointVisible" title="选择测点" width="1000">
-            <SelectPoint ref="selectPointDialogRef" :defaultAttr="defaultAttr" :visible="selectPointVisible"></SelectPoint>
+            <SelectPoint ref="selectPointDialogRef" :defaultAttr="defaultAttr" :visible="selectPointVisible" :iot-model-id="selectPointModelId"></SelectPoint>
             <template #footer>
                 <div class="selectPointDialogFooter">
                     <el-button type="primary" @click="saveSelectPoint">保存</el-button>
@@ -197,6 +197,7 @@
                 ref="realDataChartRef"
                 :visible="realDataLineChartVisible"
                 :id="clickRow!.irn"
+                :iot-model-id="selectPointModelId"
                 @clearChart="() => (linePause = false)"
             ></RealDataChart>
             <template #header>
@@ -695,6 +696,9 @@ const defaultAttr = computed(() => {
         }
     })
 })
+const selectPointModelId = computed(()=>{
+    return tableData.value[0]?.iotModelId ?? ''
+})
 const openMeasure = () => {
     selectPointVisible.value = true
 }
diff --git a/ui/dasadmin/src/views/backend/equipment/airBlower/realDataChart.vue b/ui/dasadmin/src/views/backend/equipment/airBlower/realDataChart.vue
index 31ac6e9d..c2219f1e 100644
--- a/ui/dasadmin/src/views/backend/equipment/airBlower/realDataChart.vue
+++ b/ui/dasadmin/src/views/backend/equipment/airBlower/realDataChart.vue
@@ -33,7 +33,12 @@
         </el-row>
     </div>
     <el-dialog v-model="selectPointVisible" title="选择测点" width="1000">
-        <SelectPoint ref="selectPointRef" :visible="selectPointVisible" :default-attr="selectPointAttr"></SelectPoint>
+        <SelectPoint
+            ref="selectPointRef"
+            :visible="selectPointVisible"
+            :default-attr="selectPointAttr"
+            :iot-model-id="props.iotModelId"
+        ></SelectPoint>
         <template #footer>
             <div class="selectPointDialogFooter">
                 <el-button type="primary" @click="saveSelectPoint">保存</el-button>
@@ -51,9 +56,10 @@ import { getRealValueListReq } from '/@/api/backend/deviceModel/request'
 import { dayjs, ElMessage } from 'element-plus'
 import { getCutDecimalsValue } from './utils'
 const emits = defineEmits(['clearChart'])
-const props = withDefaults(defineProps<{ id: string; visible: boolean }>(), {
+const props = withDefaults(defineProps<{ id: string; visible: boolean; iotModelId: string }>(), {
     id: '',
     visible: false,
+    iotModelId: '',
 })
 const showTimeInterval = ref(300)
 //#region
@@ -204,7 +210,7 @@ const createChartData = (data: { [k: string]: number }, time: string) => {
             fillData.push(curVal)
             return {
                 id: item,
-                name: info.name +' '+ (info?.unit ?? ''),
+                name: info.name + ' ' + (info?.unit ?? ''),
                 type: 'line',
                 barWidth: 20,
                 itemStyle: {
@@ -226,16 +232,16 @@ const createChart = () => {
     if (chartInstance && realDataXAxis.length > 1) {
         const nameMap: any = {}
         realDataSeries.forEach((item: any) => {
-            const yAxisName = item.name.split(' ')[1]            
-            if (nameMap[yAxisName] || nameMap[yAxisName]===0) {                
+            const yAxisName = item.name.split(' ')[1]
+            if (nameMap[yAxisName] || nameMap[yAxisName] === 0) {
                 item.yAxisIndex = nameMap[yAxisName]
             } else {
                 const len = Object.keys(nameMap).length
                 item.yAxisIndex = len
-                nameMap[yAxisName] = len                
+                nameMap[yAxisName] = len
             }
         })
-        
+
         const nameMapKeys = Object.keys(nameMap)
         if (realDataSeries.length >= 4 && nameMapKeys.length === 4) {
             selectPointNum.value = realDataSeries.length
diff --git a/ui/dasadmin/src/views/backend/equipment/airBlower/selectPoint.vue b/ui/dasadmin/src/views/backend/equipment/airBlower/selectPoint.vue
index 46f41cd2..aa5c8ef6 100644
--- a/ui/dasadmin/src/views/backend/equipment/airBlower/selectPoint.vue
+++ b/ui/dasadmin/src/views/backend/equipment/airBlower/selectPoint.vue
@@ -88,11 +88,13 @@ import { Top, Bottom, Close } from '@element-plus/icons-vue'
 const props = withDefaults(
     defineProps<{
         defaultAttr: { attributeCode: string; attributeName: string }[]
-        visible: boolean
+        visible: boolean,
+        iotModelId:string
     }>(),
     {
         defaultAttr: () => [],
         visible: false,
+        iotModelId:''
     }
 )
 
@@ -109,16 +111,16 @@ const subSystemVal = ref('')
 const subSystemList = ref()
 
 const getAllSubSystem = () => {
-    getAllSubSystemReq().then((res) => {
+    getAllSubSystemReq({iotModelId:props.iotModelId}).then((res) => {
         const data = res.data
             .filter((item: any) => item)
-            .map((item:any) => {
+            .map((item: any) => {
                 return {
                     label: item,
                     value: item,
                 }
             })
-        subSystemList.value = [...data, { label: '全部', value: ' ' }]
+        subSystemList.value = [{ label: '全部', value: ' ' }, ...data]
     })
 }
 
@@ -195,11 +197,11 @@ const getTableData = (customData = {}) => {
     inputVal[searchType.value] = searchInfo.value
 
     getModelAttributeListReq({
-        iotModelId: '',
+        iotModelId: props.iotModelId,
         // attributeType: radioActiveName.value,
         pageNum: pageSetting.current,
         pageSize: pageSetting.pageSize,
-        subSystem: (!subSystemVal.value || subSystemVal.value === ' ') ? null : subSystemVal.value,
+        subSystem: !subSystemVal.value || subSystemVal.value === ' ' ? null : subSystemVal.value,
         ...inputVal,
         ...customData,
     })