From 02f4f6ecd8ede09def8c0f29e32daefd3c46ef49 Mon Sep 17 00:00:00 2001
From: tianyongbao <tianyongbao@haier.com>
Date: Mon, 19 Jan 2026 11:19:51 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E6=9B=B2=E7=BA=BF=E5=9B=BE=E5=8A=9F?=
 =?UTF-8?q?=E8=83=BD=E4=BC=98=E5=8C=96=EF=BC=8C=E6=94=BE=E5=A4=A7=E5=85=A8?=
 =?UTF-8?q?=E5=B1=8F=E6=98=BE=E7=A4=BA=E4=BC=98=E5=8C=96=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../other/chartFullscreen.config.ts           |   1 +
 src/components/other/chartFullscreen.vue      | 391 ++++++++++--------
 src/components/other/index.vue                |  11 +-
 src/pages/main/home.vue                       |   1 +
 src/utils/request.ts                          |   4 +-
 5 files changed, 223 insertions(+), 185 deletions(-)

diff --git a/src/components/other/chartFullscreen.config.ts b/src/components/other/chartFullscreen.config.ts
index c8bc19c..ad3a21e 100644
--- a/src/components/other/chartFullscreen.config.ts
+++ b/src/components/other/chartFullscreen.config.ts
@@ -2,4 +2,5 @@ export default definePageConfig({
   navigationBarTitleText: '曲线图',
   navigationStyle: 'custom',
   enablePullDownRefresh: false,
+  pageOrientation: 'landscape',
 })
diff --git a/src/components/other/chartFullscreen.vue b/src/components/other/chartFullscreen.vue
index 34d89d0..6232778 100644
--- a/src/components/other/chartFullscreen.vue
+++ b/src/components/other/chartFullscreen.vue
@@ -1,5 +1,5 @@
 <template>
-  <view class="chart-fullscreen-page">
+  <view class="chart-fullscreen-page" :style="pageStyle">
     <!-- 顶部标题栏 -->
     <view class="header">
       <view class="back-btn" @click="goBack">
@@ -34,18 +34,19 @@
     </view>
 
     <!-- 图表容器 -->
-    <view class="chart-container">
+    <view class="chart-container" :style="chartContainerStyle">
       <canvas
         class="chart-canvas"
-        canvas-id="fullscreen-chart"
+        type="2d"
         id="fullscreen-chart"
+        :style="canvasStyle"
       ></canvas>
     </view>
   </view>
 </template>
 
 <script setup lang="ts">
-import { ref, onMounted, onUnmounted } from 'vue';
+import { ref, computed, onMounted, onUnmounted } from 'vue';
 import Taro from '@tarojs/taro';
 import { deviceHistory } from '@/api/device';
 import { formatDateMin } from '@/utils/tools';
@@ -60,7 +61,43 @@ let chartInstance: any = null;
 const serialNum = ref('');
 const dataType = ref(1); // 1-溶解氧, 2-水温, 3-饱和度, 4-PH, 5-盐度
 
+// 屏幕尺寸
+const screenWidth = ref(375);
+const screenHeight = ref(667);
+
+// 页面样式（小程序通过配置自动横屏）
+const pageStyle = computed(() => {
+  return {
+    width: '100%',
+    height: '100%',
+    background: '#fff',
+    display: 'flex',
+    flexDirection: 'column' as const,
+  };
+});
+
+const chartContainerStyle = computed(() => {
+  return {
+    flex: '1',
+    padding: '10px 15px',
+    background: '#fff',
+    overflow: 'hidden',
+  };
+});
+
+const canvasStyle = computed(() => {
+  return {
+    width: chartWidth.value + 'px',
+    height: chartHeight.value + 'px',
+  };
+});
+
 onMounted(() => {
+  // 获取屏幕尺寸
+  const sysInfo = Taro.getSystemInfoSync();
+  screenWidth.value = sysInfo.windowWidth;
+  screenHeight.value = sysInfo.windowHeight;
+  
   // 获取页面参数
   const instance = Taro.getCurrentInstance();
   const params = instance.router?.params || {};
@@ -85,29 +122,22 @@ onUnmounted(() => {
   }
 });
 
+// 图表尺寸
+const chartWidth = ref(0);
+const chartHeight = ref(0);
+const chartPixelRatio = ref(1);
+
 // 初始化图表
 function initChart() {
-  // 横屏后的尺寸计算：
-  // 页面宽度 = 屏幕高度（100vh）
-  // 页面高度 = 屏幕宽度（100vw）
-  // header(50px) + time-selector(50px) = 100px
-  
-  const screenWidth = window.innerWidth;   // 屏幕宽度
-  const screenHeight = window.innerHeight; // 屏幕高度
-  
-  // 横屏后：
-  const cWidth = screenHeight - 40;  // 页面宽度(100vh) - padding
-  const cHeight = screenWidth - 120; // 页面高度(100vw) - header - time-selector - padding
-  
-  console.log('📊 横屏图表尺寸计算:', {
-    屏幕宽: screenWidth,
-    屏幕高: screenHeight,
-    图表宽: cWidth,
-    图表高: cHeight
-  });
+  const sysInfo = Taro.getSystemInfoSync();
+  // 横屏模式，windowWidth 是横屏后的宽度（较大），windowHeight 是横屏后的高度（较小）
+  // header(44px) + time-selector(44px) = 88px
+  chartWidth.value = sysInfo.windowWidth - 30;
+  chartHeight.value = sysInfo.windowHeight - 100;
+  chartPixelRatio.value = sysInfo.pixelRatio || 1;
   
   // 加载数据
-  loadChartData(cWidth, cHeight, 1);
+  loadChartData();
 }
 
 // 返回上一页
@@ -125,18 +155,11 @@ function goHome() {
 // 切换天数
 function changeDay(day: number) {
   dayType.value = day;
-  
-  // 重新计算尺寸
-  const screenWidth = window.innerWidth;
-  const screenHeight = window.innerHeight;
-  const cWidth = screenHeight - 40;
-  const cHeight = screenWidth - 120;
-  
-  loadChartData(cWidth, cHeight, 1);
+  loadChartData();
 }
 
 // 加载图表数据
-function loadChartData(cWidth: number, cHeight: number, pixelRatio: number) {
+function loadChartData() {
   if (!serialNum.value) return;
   
   const now = new Date();
@@ -161,19 +184,22 @@ function loadChartData(cWidth: number, cHeight: number, pixelRatio: number) {
     }
     
     // 绘制图表
-    drawChart(cWidth, cHeight, pixelRatio);
+    drawChart();
   }).catch(() => {
     Taro.hideLoading();
   });
 }
 
 // 绘制图表
-function drawChart(cWidth: number, cHeight: number, pixelRatio: number) {
+function drawChart() {
   if (!chartData.value || chartData.value.length === 0) {
-    console.log('❌ 数据为空');
     return;
   }
   
+  const cWidth = chartWidth.value;
+  const cHeight = chartHeight.value;
+  const pixelRatio = chartPixelRatio.value;
+  
   const fieldMap: any = {
     1: 'dissolvedOxygen',
     2: 'temperature',
@@ -200,13 +226,12 @@ function drawChart(cWidth: number, cHeight: number, pixelRatio: number) {
     const timeStr = item.time || item.createTime || '';
     const timeParts = timeStr.split(' ');
     if (timeParts.length > 1) {
-      const datePart = timeParts[0]; // YYYY-MM-DD
-      const timePart = timeParts[1]; // HH:mm:ss.0
+      const datePart = timeParts[0];
+      const timePart = timeParts[1];
       
-      // 提取 MM-DD HH:mm
       const dateMatch = datePart.match(/\d{4}-(\d{2})-(\d{2})/);
       const monthDay = dateMatch ? `${dateMatch[1]}-${dateMatch[2]}` : '';
-      const hourMin = timePart.substring(0, 5); // HH:mm
+      const hourMin = timePart.substring(0, 5);
       
       const formattedTime = `${monthDay} ${hourMin}`;
       xAxisData.push(formattedTime);
@@ -215,174 +240,180 @@ function drawChart(cWidth: number, cHeight: number, pixelRatio: number) {
     seriesData.push(value !== null && value !== undefined ? Number(value) : 0);
   });
   
-  // H5 环境，延迟获取 Canvas 确保 DOM 渲染完成
-  setTimeout(() => {
-    // Taro 在 H5 下会在容器内部生成 <canvas> 标签
-    const canvasElement = document.querySelector('#fullscreen-chart canvas') as HTMLCanvasElement;
+  Taro.nextTick(() => {
+    const env = Taro.getEnv();
     
-    if (!canvasElement) {
-      console.error('❌ Canvas 元素未找到');
-      console.log('尝试查找所有 canvas...');
-      const allCanvas = document.querySelectorAll('canvas');
-      console.log('页面中所有 canvas:', allCanvas);
-      return;
+    if (env === Taro.ENV_TYPE.WEB) {
+      // H5 环境
+      setTimeout(() => {
+        const canvasElement = document.querySelector('#fullscreen-chart canvas') as HTMLCanvasElement;
+        if (!canvasElement) return;
+        
+        const ctx = canvasElement.getContext('2d');
+        if (!ctx) return;
+        
+        chartInstance = new uCharts({
+          type: 'line',
+          context: ctx,
+          width: cWidth,
+          height: cHeight,
+          categories: xAxisData,
+          series: [{ name: seriesName, data: seriesData }],
+          pixelRatio: 1,
+          dataPointShape: false,
+          animation: true,
+          background: '#FFFFFF',
+          color: ['#17B4B2'],
+          padding: [15, 15, 30, 40],
+          enableScroll: false,
+          boundaryGap: 'justify',
+          legend: { show: false },
+          dataLabel: false,
+          xAxis: {
+            disableGrid: true,
+            axisLine: true,
+            type: 'grid',
+            gridType: 'dash',
+            scrollShow: false,
+            labelCount: 8,
+            rotateLabel: true,
+            rotateAngle: 30,
+          },
+          yAxis: {
+            disableGrid: false,
+            gridType: 'dash',
+            tofix: 2,
+          },
+          extra: {
+            line: { type: 'curve', width: 2, activeType: 'hollow' },
+          },
+        });
+      }, 300);
+    } else {
+      // 小程序环境
+      const query = Taro.createSelectorQuery();
+      query.select('#fullscreen-chart')
+        .fields({ node: true, size: true })
+        .exec((res) => {
+          if (!res || !res[0] || !res[0].node) return;
+          
+          const canvas = res[0].node;
+          const ctx = canvas.getContext('2d');
+          if (!ctx) return;
+          
+          canvas.width = cWidth * pixelRatio;
+          canvas.height = cHeight * pixelRatio;
+          
+          chartInstance = new uCharts({
+            type: 'line',
+            context: ctx,
+            width: cWidth * pixelRatio,
+            height: cHeight * pixelRatio,
+            categories: xAxisData,
+            series: [{ name: seriesName, data: seriesData }],
+            pixelRatio: pixelRatio,
+            dataPointShape: false,
+            animation: true,
+            background: '#FFFFFF',
+            color: ['#17B4B2'],
+            padding: [15, 15, 30, 40],
+            enableScroll: false,
+            boundaryGap: 'justify',
+            legend: { show: false },
+            dataLabel: false,
+            xAxis: {
+              disableGrid: true,
+              axisLine: true,
+              type: 'grid',
+              gridType: 'dash',
+              scrollShow: false,
+              labelCount: 6,
+              rotateLabel: true,
+              rotateAngle: 20,
+              marginTop: 5,
+            },
+            yAxis: {
+              disableGrid: false,
+              gridType: 'dash',
+              tofix: 2,
+            },
+            extra: {
+              line: { type: 'curve', width: 2, activeType: 'hollow' },
+            },
+          });
+        });
     }
-    
-    console.log('✅ 找到 Canvas 元素:', canvasElement);
-    
-    const ctx = canvasElement.getContext('2d');
-    if (!ctx) {
-      console.error('❌ 无法获取 Canvas Context');
-      return;
-    }
-    
-    console.log('✅ 获取 Context 成功');
-    
-    chartInstance = new uCharts({
-      type: 'line',
-      context: ctx,
-      width: cWidth,
-      height: cHeight,
-      categories: xAxisData,
-      series: [
-        {
-          name: seriesName,
-          data: seriesData,
-        }
-      ],
-      pixelRatio: 1,
-      dataPointShape: false,
-      animation: true,
-      background: '#FFFFFF',
-      color: ['#1890FF'],
-      padding: [15, 30, 35, 45],
-      enableScroll: false,
-      boundaryGap: 'justify',
-      legend: {
-        show: false
-      },
-      dataLabel: false,
-      xAxis: {
-        disableGrid: true,
-        axisLine: true,
-        type: 'grid',
-        gridType: 'dash',
-        itemCount: 0,
-        scrollShow: false,
-        scrollAlign: 'left',
-        labelCount: 10,
-        rotateLabel: true,
-        rotateAngle: 25,
-      },
-      yAxis: {
-        disableGrid: false,
-        gridType: 'dash',
-        tofix: 2,
-      },
-      extra: {
-        line: {
-          type: 'curve',
-          width: 2,
-          activeType: 'hollow',
-          linearType: 'custom',
-        },
-      },
-    });
-    
-    console.log('✅ 图表绘制完成');
-  }, 300);
+  });
 }
 </script>
 
-<style scoped lang="scss">
+<style lang="scss">
 .chart-fullscreen-page {
-  position: fixed;
-  top: 50%;
-  left: 50%;
-  width: 100vh;  // 横屏后的宽度 = 屏幕高度
-  height: 100vw; // 横屏后的高度 = 屏幕宽度
-  transform: translate(-50%, -50%) rotate(90deg);
   background: #fff;
-  display: flex;
-  flex-direction: column;
-  z-index: 9999;
 }
 
 .header {
-  height: 50px;
+  height: 44px;
   background: #fff;
   display: flex;
   align-items: center;
-  justify-content: space-between;
   padding: 0 15px;
   border-bottom: 1px solid #eee;
   flex-shrink: 0;
-  
-  .back-btn {
-    width: 40px;
-    height: 40px;
-    display: flex;
-    align-items: center;
-    justify-content: center;
-    
-    .icon {
-      font-size: 28px;
-      color: #333;
-    }
-  }
-  
-  .title {
-    font-size: 28px;
-    font-weight: 600;
-    color: #333;
-  }
-  
-  .home-btn {
-    width: 40px;
-    height: 40px;
-    display: flex;
-    align-items: center;
-    justify-content: center;
-    
-    .home-icon {
-      font-size: 24px;
-    }
-  }
+}
+
+.back-btn {
+  width: 44px;
+  height: 44px;
+  display: flex;
+  align-items: center;
+  justify-content: center;
+}
+
+.back-btn .icon {
+  font-size: 24px;
+  color: #333;
+}
+
+.title {
+  flex: 1;
+  text-align: center;
+  font-size: 16px;
+  font-weight: 600;
+  color: #333;
+  margin-right: 44px;
 }
 
 .time-selector {
   display: flex;
   justify-content: center;
   align-items: center;
-  padding: 10px;
-  gap: 12px;
+  padding: 8px 15px;
   background: #fff;
   flex-shrink: 0;
-  height: 50px;
-  
-  .time-item {
-    padding: 8px 24px;
-    background: #f5f5f5;
-    border-radius: 6px;
-    font-size: 24px;
-    color: #666;
-    
-    &.active {
-      background: #1890FF;
-      color: #fff;
-    }
-  }
+  height: 44px;
+  border-bottom: 1px solid #eee;
+}
+
+.time-item {
+  padding: 6px 20px;
+  margin: 0 8px;
+  background: #f5f5f5;
+  border-radius: 4px;
+  font-size: 14px;
+  color: #666;
+}
+
+.time-item.active {
+  background: #09B8C2;
+  color: #fff;
 }
 
 .chart-container {
-  flex: 1;
-  position: relative;
   background: #fff;
-  padding: 10px;
-  
-  .chart-canvas {
-    width: 100%;
-    height: 100%;
-  }
+}
+
+.chart-canvas {
+  display: block;
 }
 </style>
diff --git a/src/components/other/index.vue b/src/components/other/index.vue
index 9fab6a9..1d4b48d 100644
--- a/src/components/other/index.vue
+++ b/src/components/other/index.vue
@@ -726,6 +726,11 @@ const props = defineProps({
     required: true,
     default: 1,
   },
+  // 公告弹窗是否打开
+  noticeOpen: {
+    type: Boolean,
+    default: false,
+  },
 });
 const pondDeviceRes = ref<any>();
 const emit = defineEmits(["getPondInfo", "getRes", "render", "addDevice"]);
@@ -1419,7 +1424,7 @@ function createCharts(x, series, ids) {
             animation: true,
             background: "#FFFFFF",
             color: ["#17B4B2", "#5470c6", "#fac858"],
-            padding: [15, 30, 35, 45],
+            padding: [15, 50, 35, 15],
             enableScroll: false,
             boundaryGap: "justify",
             update: true,
@@ -1437,9 +1442,9 @@ function createCharts(x, series, ids) {
               itemCount: 0,
               scrollShow: false,
               scrollAlign: "left",
-              labelCount: 7,
+              labelCount: 6,
               rotateLabel: true,
-              rotateAngle: 30,
+              rotateAngle: 45,
               marginTop: 10,
             },
             yAxis: {
diff --git a/src/pages/main/home.vue b/src/pages/main/home.vue
index bd80b1b..a36706a 100644
--- a/src/pages/main/home.vue
+++ b/src/pages/main/home.vue
@@ -307,6 +307,7 @@
                   @addDevice="addDevice"
                   ref="pondChildInfo"
                   type="1"
+                  :noticeOpen="noticeOpen"
                 />
               </nut-col>
             </nut-row>
diff --git a/src/utils/request.ts b/src/utils/request.ts
index 09ec942..bdd62dc 100644
--- a/src/utils/request.ts
+++ b/src/utils/request.ts
@@ -12,8 +12,8 @@ const getBaseUrl = () => {
     BASE_URL = 'http://127.0.0.1:8080' // 本地调试后端地址
   } else {
     // BASE_URL = 'https://api.yuceyun.cn' //填写你的请求域名
-    // BASE_URL = 'https://www.qdintc.com/fishery-api' // 测试环境
-      BASE_URL = 'http://127.0.0.1:8080' // 本地调试后端地址
+    BASE_URL = 'https://www.qdintc.com/fishery-api' // 测试环境
+      // BASE_URL = 'http://127.0.0.1:8080' // 本地调试后端地址
     // BASE_URL = 'http://47.102.210.182:6678' //测试环境
   }
   return BASE_URL