Merge branch 'master' of http://47.109.37.87:3000/by2025/admin-vben5

apps/web-antd/src/views/property/energyManagement/electricEnergy/elctricitySituation/index.vue

@@ -1,14 +1,15 @@
 <script setup lang="ts">
-import { RadioGroup, RadioButton } from 'ant-design-vue'
+import { RadioGroup, RadioButton, message } from 'ant-design-vue';
-import { Page } from '@vben/common-ui'
+import { Page } from '@vben/common-ui';
-import { ref, onMounted, onBeforeUnmount, reactive } from 'vue'
+import { ref, onMounted, onBeforeUnmount, reactive } from 'vue';
-import * as echarts from 'echarts'
+import * as echarts from 'echarts';
-import type { ECharts, EChartsOption } from 'echarts'
+import type { ECharts, EChartsOption } from 'echarts';
-import FloorTree from "../components/floor-tree.vue"
+import FloorTree from '../components/floor-tree.vue';
-import dayjs from "dayjs"
+import dayjs from 'dayjs';
+import { meterRecordTrend } from '#/api/property/energyManagement/meterRecord';
 
 // 左边楼层用
-const selectFloorId = ref<string[]>([])
+const selectFloorId = ref<string[]>([]);
 
 const chainData = reactive({
   todayEnergy: '231.78',
@@ -23,27 +24,27 @@ const chainData = reactive({
   lastYearSamePeriodEnergy: '--',
   yearTrendPercentage: '--',
   yearTrendValue: '--',
-})
+});
 
 const peakData = reactive({
   todayPeakPower: '2961.08',
   todayPeakTime: dayjs().format('YYYY-MM-DD HH:mm:ss'),
   yesterdayPeakPower: '2993.89',
   yesterdayPeakTime: dayjs().subtract(1, 'day').format('YYYY-MM-DD HH:mm:ss'),
-})
+});
 
-const energyTrendTime = ref('1')
+const energyTrendTime = ref('1');
 
 // 能耗趋势图表容器
-const energyTrendChart = ref<HTMLElement | null>(null)
+const energyTrendChart = ref<HTMLElement | null>(null);
-const energyTrendInstance = ref<ECharts | null>(null)
+const energyTrendInstance = ref<ECharts | null>(null);
 
 const energyTrendOption: EChartsOption = {
   tooltip: {
     trigger: 'item',
     axisPointer: {
-      type: 'shadow'
+      type: 'shadow',
-    }
+    },
   },
   xAxis: {
     type: 'category',
@@ -61,73 +62,78 @@ const energyTrendOption: EChartsOption = {
       markPoint: {
         data: [
           { type: 'max', name: 'Max' },
-          { type: 'min', name: 'Min' }
+          { type: 'min', name: 'Min' },
-        ]
-      },
-    }
         ],
-}
+      },
+    },
+  ],
+};
 
 const initEnergyTrendChart = () => {
   if (energyTrendChart.value) {
     // 销毁旧实例
-    energyTrendInstance.value?.dispose()
+    energyTrendInstance.value?.dispose();
     // 创建新实例
-    energyTrendInstance.value = echarts.init(energyTrendChart.value)
+    energyTrendInstance.value = echarts.init(energyTrendChart.value);
     // 设置配置项
-    energyTrendInstance.value.setOption(energyTrendOption)
+    energyTrendInstance.value.setOption(energyTrendOption);
-    buildingEnergyTrendData('1')
+    // buildingEnergyTrendData('1');
     // 可选：添加窗口大小变化监听
     const resizeHandler = () => {
-      energyTrendInstance.value?.resize()
+      energyTrendInstance.value?.resize();
-    }
+    };
-    window.addEventListener('resize', resizeHandler)
+    window.addEventListener('resize', resizeHandler);
 
     // 在组件卸载前移除监听
     onBeforeUnmount(() => {
-      window.removeEventListener('resize', resizeHandler)
+      window.removeEventListener('resize', resizeHandler);
-    })
+    });
   }
-}
+};
 
 function buildingEnergyTrendData(val: string) {
-  const now = new Date()
+  if (trendData.value.hour == null) {
-  let timeArr = []
+    message.warning('请先选择楼层或电表！');
-  let valArr = []
+    return;
-  let name = '时间'
+  }
+
+  const now = new Date();
+  let timeArr = [];
+  let valArr = [];
+  let name = '时间';
   if (val == '1') {
-    const hour = now.getHours()
+    const hour = now.getHours();
     for (let i = 0; i < hour; i++) {
-      timeArr.push(i)
+      timeArr.push(i + ':00');
-      valArr.push(parseFloat((Math.random() * 35).toFixed(2)))
     }
+    valArr = trendData.value.hour.today.data;
   } else if (val == '2') {
-    const day = now.getDate()
+    const day = now.getDate();
     for (let i = 1; i < day; i++) {
-      timeArr.push(i)
+      timeArr.push(i);
-      valArr.push(parseFloat((Math.random() * 800).toFixed(2)))
     }
-    name = '日期'
+    name = '日期';
+    valArr = trendData.value.day.nowMonth.data;
   } else {
-    const month = now.getMonth() + 1
+    const month = now.getMonth() + 1;
-    for (let i = 1; i < month; i++) {
+    for (let i = 1; i < month + 1; i++) {
-      timeArr.push(i)
+      timeArr.push(i);
-      valArr.push(parseFloat((Math.random() * 21000).toFixed(2)))
     }
-    name = '月份'
+    name = '月份';
+    valArr = trendData.value.month.nowYear.data;
   }
 
   if (energyTrendInstance.value) {
     energyTrendInstance.value.setOption({
       xAxis: { data: timeArr, name },
       series: [{ data: valArr }],
-    })
+    });
   }
 }
 
 //日用电率
-const powerCurveChart = ref<HTMLElement | null>(null)
+const powerCurveChart = ref<HTMLElement | null>(null);
-const powerCurveInstance = ref<ECharts | null>(null)
+const powerCurveInstance = ref<ECharts | null>(null);
 
 const powerCurveOption: EChartsOption = {
   tooltip: {
@@ -135,28 +141,53 @@ const powerCurveOption: EChartsOption = {
     axisPointer: {
       type: 'cross',
       crossStyle: {
-        color: '#999'
+        color: '#999',
-      }
+      },
-    }
+    },
   },
   toolbox: {
     feature: {
       magicType: { show: true, type: ['line', 'bar'] },
       restore: { show: true },
-    }
+    },
   },
   legend: {
-    data: ['今日', '昨日']
+    data: ['今日', '昨日'],
   },
   xAxis: [
     {
       type: 'category',
-      data: [],
+      data: [
+        '0:00',
+        '1:00',
+        '2:00',
+        '3:00',
+        '4:00',
+        '5:00',
+        '6:00',
+        '7:00',
+        '8:00',
+        '9:00',
+        '10:00',
+        '11:00',
+        '12:00',
+        '13:00',
+        '14:00',
+        '15:00',
+        '16:00',
+        '17:00',
+        '18:00',
+        '19:00',
+        '20:00',
+        '21:00',
+        '22:00',
+        '23:00',
+      ],
       axisPointer: {
-        type: 'shadow'
+        type: 'shadow',
+      },
+      name: '时',
     },
-      name: '时'
-    }
   ],
   yAxis: [
     {
@@ -166,98 +197,143 @@ const powerCurveOption: EChartsOption = {
   ],
   series: [
     {
-      name: '今日',
+      name: '昨日',
       type: 'line',
       smooth: true,
       data: [],
       markPoint: {
-        data: [
+        data: [{ type: 'max' }, { type: 'min' }],
-          { type: 'max', },
+      },
-          { type: 'min', }
+      itemStyle: { color: '#cbb0e3' }, // 数据点颜色
-        ]
+      lineStyle: { color: '#cbb0e3' }, // 线条颜色
+    },
+  ],
+};
+
+const initPowerCurveChart = () => {
+  if (powerCurveChart.value) {
+    // 销毁旧实例
+    powerCurveInstance.value?.dispose();
+    // 创建新实例
+    powerCurveInstance.value = echarts.init(powerCurveChart.value);
+    // 设置配置项
+    powerCurveInstance.value.setOption(powerCurveOption);
+    // 可选：添加窗口大小变化监听
+    const resizeHandler = () => {
+      powerCurveInstance.value?.resize();
+    };
+    window.addEventListener('resize', resizeHandler);
+
+    // 在组件卸载前移除监听
+    onBeforeUnmount(() => {
+      window.removeEventListener('resize', resizeHandler);
+    });
+  }
+};
+
+// 组件挂载后初始化图表
+onMounted(() => {
+  initEnergyTrendChart();
+  initPowerCurveChart();
+});
+
+// 组件卸载前销毁图表实例
+onBeforeUnmount(() => {
+  energyTrendInstance.value?.dispose();
+  powerCurveInstance.value?.dispose();
+});
+
+const trendData = ref<any>({});
+async function handleSelectFloor(selectedKeys, info) {
+  const now = new Date();
+  // 获取年、月、日
+  const year = now.getFullYear();
+  // 月份从0开始，所以要+1，并格式化为两位数
+  const month = String(now.getMonth() + 1).padStart(2, '0');
+  // 日期格式化为两位数
+  const day = String(now.getDate()).padStart(2, '0');
+
+  let data = {
+    day: year + '-' + month + '-' + day,
+    month: year + '-' + month,
+    year: year,
+    meterType: 1,
+    meterId: null,
+    floorId: null,
+  };
+
+  if (info.node.level == 3) {
+    data.floorId = selectedKeys[0];
+  } else {
+    data.meterId = selectedKeys[0];
+  }
+
+  const trend = await meterRecordTrend(data);
+  trendData.value = trend;
+
+  // 趋势曲线
+  let timeArr = [];
+  let valArr = [];
+  let name = '时间';
+  if (energyTrendTime.value == '1') {
+    const hour = now.getHours();
+    for (let i = 0; i < hour; i++) {
+      timeArr.push(i + ':00');
+    }
+    valArr = trend.hour.today.data;
+  } else if (energyTrendTime.value == '2') {
+    const day = now.getDate();
+    for (let i = 1; i < day; i++) {
+      timeArr.push(i);
+    }
+    name = '日期';
+    valArr = trend.day.nowMonth.data;
+  } else {
+    const month = now.getMonth() + 1;
+    for (let i = 1; i < month + 1; i++) {
+      timeArr.push(i);
+    }
+    name = '月份';
+    valArr = trend.month.nowYear.data;
+  }
+  if (energyTrendInstance.value) {
+    energyTrendInstance.value.setOption({
+      xAxis: { data: timeArr, name },
+      series: [{ data: valArr }],
+    });
+  }
+
+  if (powerCurveInstance.value) {
+    powerCurveInstance.value.setOption({
+      series: [
+        {
+          name: '今日',
+          type: 'line',
+          smooth: true,
+          data: trend.hour.today.data,
+          markPoint: {
+            data: [{ type: 'max' }, { type: 'min' }],
           },
         },
         {
           name: '昨日',
           type: 'line',
           smooth: true,
-      data: [],
+          data: trend.hour.yesterday.data,
           markPoint: {
-        data: [
+            data: [{ type: 'max' }, { type: 'min' }],
-          { type: 'max', },
-          { type: 'min', }
-        ]
           },
-      itemStyle: { color: '#cbb0e3' }, // 数据点颜色
-      lineStyle: { color: '#cbb0e3' }  // 线条颜色
         },
-  ]
+      ],
-}
+    });
-
-const initPowerCurveChart = () => {
-  if (powerCurveChart.value) {
-    // 销毁旧实例
-    powerCurveInstance.value?.dispose()
-    // 创建新实例
-    powerCurveInstance.value = echarts.init(powerCurveChart.value)
-    // 设置配置项
-    powerCurveInstance.value.setOption(powerCurveOption)
-    buildingPowerCurveData()
-    // 可选：添加窗口大小变化监听
-    const resizeHandler = () => {
-      powerCurveInstance.value?.resize()
   }
-    window.addEventListener('resize', resizeHandler)
-
-    // 在组件卸载前移除监听
-    onBeforeUnmount(() => {
-      window.removeEventListener('resize', resizeHandler)
-    })
-  }
-}
-
-function buildingPowerCurveData() {
-  const now = new Date()
-  const hour = now.getHours()
-  let yesterday = []
-  let today = []
-  let timeDate = []
-  for (let i = 0; i < 24; i++) {
-    timeDate.push(i)
-    yesterday.push(parseFloat((Math.random() * 3000).toFixed(2)))
-    if (hour > i) {
-      today.push(parseFloat((Math.random() * 3000).toFixed(2)))
-    }
-  }
-  if (powerCurveInstance.value) {
-    powerCurveInstance.value.setOption({
-      xAxis: { data: timeDate },
-      series: [{ data: today }, { data: yesterday }],
-    })
-  }
-}
-
-// 组件挂载后初始化图表
-onMounted(() => {
-  initEnergyTrendChart()
-  initPowerCurveChart()
-})
-
-// 组件卸载前销毁图表实例
-onBeforeUnmount(() => {
-  energyTrendInstance.value?.dispose()
-  powerCurveInstance.value?.dispose()
-})
-
-function handleSelectFloor() {
-  console.log(selectFloorId.value[0])
 }
 </script>
 
 <template>
   <Page :auto-content-height="true">
     <div class="flex h-full gap-[8px]">
-      <FloorTree class="w-[260px]"></FloorTree>
+      <FloorTree class="w-[260px]" @select="handleSelectFloor"></FloorTree>
       <div class="flex-1 overflow-hidden">
         <div class="row">
           <div class="energy-trend-container">
@@ -265,26 +341,28 @@ function handleSelectFloor() {
               <div class="section-header">
                 <div class="header-title">能耗趋势</div>
               </div>
-              <RadioGroup v-model:value="energyTrendTime" button-style="solid" size="small"
+              <RadioGroup
-                @change="buildingEnergyTrendData(energyTrendTime)">
+                v-model:value="energyTrendTime"
+                button-style="solid"
+                size="small"
+                @change="buildingEnergyTrendData(energyTrendTime)"
+              >
                 <RadioButton value="1">当日</RadioButton>
                 <RadioButton value="2">当月</RadioButton>
                 <RadioButton value="3">当年</RadioButton>
               </RadioGroup>
             </div>
-            <div class="chart-placeholder" ref="energyTrendChart">
+            <div class="chart-placeholder" ref="energyTrendChart"></div>
-            </div>
           </div>
         </div>
         <div class="row">
           <div class="power-curve-container">
             <div class="section-header">
-              <div class="header-title">日用电功率曲线</div>
+              <div class="header-title">平均电功率曲线</div>
             </div>
-            <div class="power-chart" ref="powerCurveChart">
+            <div class="power-chart" ref="powerCurveChart"></div>
           </div>
-          </div>
+          <!-- <div class="power-peak-container">
-          <div class="power-peak-container">
             <div class="section-header">
               <div class="header-title">电功率峰值</div>
             </div>
@@ -298,7 +376,7 @@ function handleSelectFloor() {
               <p class="time">{{ peakData.yesterdayPeakTime }}</p>
               <div class="bottom-text">昨日(kW)</div>
             </div>
-          </div>
+          </div> -->
         </div>
       </div>
     </div>
@@ -332,7 +410,7 @@ function handleSelectFloor() {
 
 .energy-trend-top {
   display: flex;
-  justify-content: space-between
+  justify-content: space-between;
 }
 
 .section-header {

apps/web-antd/src/views/property/resident/personPassRecordManagement/data.ts

@@ -11,7 +11,7 @@ export const querySchema: FormSchemaGetter = () => [
   },
   {
     component: 'Input',
-    fieldName: 'customerName',
+    fieldName: 'personName',
     label: '人员姓名',
   },
   {
@@ -63,6 +63,7 @@ export const columns: VxeGridProps['columns'] = [
   {
     title: '所属组织',
     field: 'organFullPath',
+    minWidth: 180,
   },
   {
     title: '门卡类别',