From b421a6585841596f848c56d476892f5deaefbe9d Mon Sep 17 00:00:00 2001
From: Flow <958079825@qq.com>
Date: Mon, 30 Jun 2025 16:07:26 +0800
Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E6=95=B4=E6=9C=BA=E6=9E=84=E6=9F=A5?=
 =?UTF-8?q?=E8=AF=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/person/index.ts     |  4 ++--
 src/views/Home/Index.vue    | 27 +++++++++++++++++++++------
 src/views/stat/Members.vue  |  9 +++++++--
 src/views/stat/Warnings.vue |  6 +++---
 4 files changed, 33 insertions(+), 13 deletions(-)

diff --git a/src/api/person/index.ts b/src/api/person/index.ts
index d405962ef..55a89aed8 100644
--- a/src/api/person/index.ts
+++ b/src/api/person/index.ts
@@ -88,8 +88,8 @@ export const PersonApi = {
   },
 
   // 查询会员开通数量
-  getMemberRegisterCount: async (startDate: string, endDate: string) => {
-    return await request.get({ url: `/system/person/get-member-register-count?startDate=` + startDate + `&endDate=` + endDate })
+  getMemberRegisterCount: async (startDate: string, endDate: string,orgid:number) => {
+    return await request.get({ url: `/system/person/get-member-register-count?startDate=` + startDate + `&endDate=` + endDate + `&orgid=` + orgid })
   },
 
   // 获取会员增长数据
diff --git a/src/views/Home/Index.vue b/src/views/Home/Index.vue
index 6a082349c..c981e3ca3 100644
--- a/src/views/Home/Index.vue
+++ b/src/views/Home/Index.vue
@@ -145,7 +145,11 @@ const memberLineOptions = ref<any>({
 const getAlertData = async (orgid: number) => {
   try {
     const data = await AlertMessageApi.getAlertStatistics(orgid)
-    Object.assign(alertData, data)
+    // 使用安全的数据合并，保留默认值
+    if (data) {
+      alertData.alertTotal = data.alertTotal ?? alertData.alertTotal
+      alertData.alertUnhandled = data.alertUnhandled ?? alertData.alertUnhandled
+    }
   } catch (error) {
     console.error('获取预警数据失败:', error)
     ElMessage.error('获取预警数据失败')
@@ -156,7 +160,12 @@ const getAlertData = async (orgid: number) => {
 const getDeviceStats = async (orgid: number) => {
   try {
     const data = await DeviceApi.getDeviceStatistics(orgid)
-    Object.assign(deviceStats, data)
+    // 使用安全的数据合并，保留默认值
+    if (data) {
+      deviceStats.totalCount = data.totalCount ?? deviceStats.totalCount
+      deviceStats.onlineCount = data.onlineCount ?? deviceStats.onlineCount
+      deviceStats.offlineCount = data.offlineCount ?? deviceStats.offlineCount
+    }
   } catch (error) {
     console.error('获取设备统计数据失败:', error)
     ElMessage.error('获取设备统计数据失败')
@@ -168,13 +177,19 @@ const getDeviceMapData = async (orgid: number) => {
   try {
     const data = await DeviceApi.getDeviceMapData(orgid)
 
-    
-    // 更新地图数据
-    Object.assign(mapData, data)
+    // 使用安全的数据合并，保留默认值
+    if (data) {
+      mapData.totalCount = data.totalCount ?? mapData.totalCount
+      mapData.onlineCount = data.onlineCount ?? mapData.onlineCount
+      mapData.offlineCount = data.offlineCount ?? mapData.offlineCount
+      mapData.alertTotal = data.alertTotal ?? mapData.alertTotal
+      mapData.alertUnhandled = data.alertUnhandled ?? mapData.alertUnhandled
+      mapData.mapData = Array.isArray(data.mapData) ? data.mapData : mapData.mapData
+      mapData.scatterData = Array.isArray(data.scatterData) ? data.scatterData : mapData.scatterData
+    }
     
     // 更新地图配置 - 组件会自动监听options变化
     updateMapOptions()
-    
 
   } catch (error) {
     console.error('获取设备分布数据失败:', error)
diff --git a/src/views/stat/Members.vue b/src/views/stat/Members.vue
index 4ff1700fd..5769f3475 100644
--- a/src/views/stat/Members.vue
+++ b/src/views/stat/Members.vue
@@ -44,10 +44,11 @@
 <script setup lang="ts">
 import { ref, onMounted, watch, nextTick } from 'vue'
 import * as echarts from 'echarts'
-import ShortcutDateRangePicker from '@/components/ShortcutDateRangePicker/index.vue'
 import ContentWrap from '@/components/ContentWrap/src/ContentWrap.vue'
 import { PersonApi } from '@/api/person'
 import dayjs from 'dayjs'
+import { getUserProfile } from '@/api/system/user/profile'
+const userinfo = ref()
 // 图表类型：'line' 折线图，'bar' 柱状图
 const chartType = ref<'line' | 'bar'>('line')
 // 会员注册数据
@@ -120,7 +121,8 @@ const renderChart = () => {
 // 获取会员注册数量数据（调用PersonApi）
 const fetchData = async () => {
   if (!dateRange.value || !dateRange.value[0] || !dateRange.value[1]) return
-  const res = await PersonApi.getMemberRegisterCount(dateRange.value[0], dateRange.value[1])
+
+  const res = await PersonApi.getMemberRegisterCount(dateRange.value[0], dateRange.value[1],userinfo.value.dept.orgid)
   chartData.value = Array.isArray(res) ? res : []
 }
 
@@ -139,6 +141,9 @@ watch([chartData, chartType], () => {
 
 // 默认一周，首次渲染
 onMounted(() => {
+  getUserProfile().then(res => {
+    userinfo.value = res
+  })
   fetchData()
   nextTick(() => {
     renderChart()
diff --git a/src/views/stat/Warnings.vue b/src/views/stat/Warnings.vue
index 81a987547..97f612949 100644
--- a/src/views/stat/Warnings.vue
+++ b/src/views/stat/Warnings.vue
@@ -339,10 +339,10 @@ const params = ref({
 const fetchData = async () => {
   try {
     const userProfile = await getUserProfile()
-    params.value.orgid = userProfile.dept.orgid
-    
+    if(userProfile.dept.orgid!=0){
+      params.value.orgid = userProfile.dept.orgid
+    }
     const res = await AlertMessageApi.getAlertMessageStatistics(params.value)
-    console.log(res)
     // 处理返回的数据格式
     if (res && res.dailyData && Array.isArray(res.dailyData)) {
       chartData.value = res.dailyData.map((item: any) => {