From 9cf89cea89ab7457ecda67e648a18eb21ae8041e Mon Sep 17 00:00:00 2001
From: FLL <2162874245@qq.com>
Date: Wed, 27 Aug 2025 17:47:37 +0800
Subject: [PATCH 01/30] =?UTF-8?q?=E7=BC=B4=E8=B4=B9=E5=AE=A1=E6=A0=B8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../views/property/costManagement/costMeterWater/data.ts | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/apps/web-antd/src/views/property/costManagement/costMeterWater/data.ts b/apps/web-antd/src/views/property/costManagement/costMeterWater/data.ts
index d0a52f2c..a73e049e 100644
--- a/apps/web-antd/src/views/property/costManagement/costMeterWater/data.ts
+++ b/apps/web-antd/src/views/property/costManagement/costMeterWater/data.ts
@@ -5,9 +5,12 @@ import {renderDict} from "#/utils/render";
 
 export const querySchema: FormSchemaGetter = () => [
   {
-    component: 'Input',
-    fieldName: 'searchValue',
-    label: '搜索值',
+    label: '费用类型',
+    fieldName: 'costType',
+    component: 'Select',
+    componentProps: () => ({
+      options: getDictOptions('wy_cbfylx'),
+    }),
   },
 ];
 

From f951aeb5204d39f305d924b84debf54240d26af2 Mon Sep 17 00:00:00 2001
From: zcxlsm <patrickstarlsm@163.com>
Date: Sun, 31 Aug 2025 00:40:02 +0800
Subject: [PATCH 02/30] =?UTF-8?q?refactor(web-antd):=20=E9=87=8D=E6=9E=84?=
 =?UTF-8?q?=E7=94=B5=E5=8A=9B=E6=83=85=E5=86=B5=E9=A1=B5=E9=9D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../elctricitySituation/index.vue             | 641 +++++-------------
 1 file changed, 164 insertions(+), 477 deletions(-)

diff --git a/apps/web-antd/src/views/property/energyManagement/electricEnergy/elctricitySituation/index.vue b/apps/web-antd/src/views/property/energyManagement/electricEnergy/elctricitySituation/index.vue
index 37f7653e..d3cfa605 100644
--- a/apps/web-antd/src/views/property/energyManagement/electricEnergy/elctricitySituation/index.vue
+++ b/apps/web-antd/src/views/property/energyManagement/electricEnergy/elctricitySituation/index.vue
@@ -1,516 +1,203 @@
 <script setup lang="ts">
-import { RadioGroup, RadioButton, message } from 'ant-design-vue';
 import { Page } from '@vben/common-ui';
+import { BackTop } from 'ant-design-vue';
 import { ref, onMounted, onBeforeUnmount, reactive } from 'vue';
-import * as echarts from 'echarts';
-import type { ECharts, EChartsOption } from 'echarts';
 import FloorTree from '../components/floor-tree.vue';
-import dayjs from 'dayjs';
 import { meterRecordTrend } from '#/api/property/energyManagement/meterRecord';
 
-// 左边楼层用
-const selectFloorId = ref<string[]>([]);
+onMounted(() => {});
 
-const chainData = reactive({
-  todayEnergy: '231.78',
-  yesterdaySamePeriodEnergy: '269.56',
-  dayTrendPercentage: '-14.02%',
-  dayTrendValue: '-37.78',
-  currentMonthEnergy: '18758.39',
-  lastMonthSamePeriodEnergy: '--',
-  monthTrendPercentage: '--',
-  monthTrendValue: '--',
-  currentYearEnergy: '18758.39',
-  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 energyTrendChart = ref<HTMLElement | null>(null);
-const energyTrendInstance = ref<ECharts | null>(null);
-
-const energyTrendOption: EChartsOption = {
-  tooltip: {
-    trigger: 'item',
-    axisPointer: {
-      type: 'shadow',
-    },
-  },
-  xAxis: {
-    type: 'category',
-    data: [],
-    name: '时间',
-  },
-  yAxis: {
-    type: 'value',
-    name: 'kW.h',
-  },
-  series: [
-    {
-      data: [],
-      type: 'bar',
-      markPoint: {
-        data: [
-          { type: 'max', name: 'Max' },
-          { type: 'min', name: 'Min' },
-        ],
-      },
-    },
-  ],
-};
-
-const initEnergyTrendChart = () => {
-  if (energyTrendChart.value) {
-    // 销毁旧实例
-    energyTrendInstance.value?.dispose();
-    // 创建新实例
-    energyTrendInstance.value = echarts.init(energyTrendChart.value);
-    // 设置配置项
-    energyTrendInstance.value.setOption(energyTrendOption);
-    // buildingEnergyTrendData('1');
-    // 可选：添加窗口大小变化监听
-    const resizeHandler = () => {
-      energyTrendInstance.value?.resize();
-    };
-    window.addEventListener('resize', resizeHandler);
-
-    // 在组件卸载前移除监听
-    onBeforeUnmount(() => {
-      window.removeEventListener('resize', resizeHandler);
-    });
-  }
-};
-
-function buildingEnergyTrendData(val: string) {
-  if (trendData.value.hour == null) {
-    message.warning('请先选择楼层或电表！');
-    return;
-  }
-
-  const now = new Date();
-  let timeArr = [];
-  let valArr = [];
-  let name = '时间';
-  if (val == '1') {
-    const hour = now.getHours();
-    for (let i = 0; i < hour; i++) {
-      timeArr.push(i + ':00');
-    }
-    valArr = trendData.value.hour.today.data;
-  } else if (val == '2') {
-    const day = now.getDate();
-    for (let i = 1; i < day; i++) {
-      timeArr.push(i);
-    }
-    name = '日期';
-    valArr = trendData.value.day.nowMonth.data;
-  } else {
-    const month = now.getMonth() + 1;
-    for (let i = 1; i < month + 1; i++) {
-      timeArr.push(i);
-    }
-    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 powerCurveInstance = ref<ECharts | null>(null);
-
-const powerCurveOption: EChartsOption = {
-  tooltip: {
-    trigger: 'item',
-    axisPointer: {
-      type: 'cross',
-      crossStyle: {
-        color: '#999',
-      },
-    },
-  },
-  toolbox: {
-    feature: {
-      magicType: { show: true, type: ['line', 'bar'] },
-      restore: { show: true },
-    },
-  },
-  legend: {
-    data: ['今日', '昨日'],
-  },
-  xAxis: [
-    {
-      type: 'category',
-      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',
-      },
-      name: '时',
-    },
-  ],
-  yAxis: [
-    {
-      type: 'value',
-      name: 'kW',
-    },
-  ],
-  series: [
-    {
-      name: '昨日',
-      type: 'line',
-      smooth: true,
-      data: [],
-      markPoint: {
-        data: [{ 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();
-});
+onBeforeUnmount(() => {});
 
 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');
+async function handleSelectFloor(selectedKeys, info) {}
 
-  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: trend.hour.yesterday.data,
-          markPoint: {
-            data: [{ type: 'max' }, { type: 'min' }],
-          },
-        },
-      ],
-    });
-  }
-}
+ function targetFn () {
+   return document.querySelector('.flex-1')
+ }
 </script>
 
 <template>
   <Page :auto-content-height="true">
     <div class="flex h-full gap-[8px]">
       <FloorTree class="w-[260px]" @select="handleSelectFloor"></FloorTree>
-      <div class="flex-1 overflow-hidden">
-        <div class="row">
-          <div class="energy-trend-container">
-            <div class="energy-trend-top">
-              <div class="section-header">
-                <div class="header-title">能耗趋势</div>
-              </div>
-              <RadioGroup
-                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 class="flex-1">
+        <div class="cards-container">
+          <div v-for="item in 50" class="plan-card">
+            <h2>4楼电表1号<span>For business sedrvices</span></h2>
+            <div class="etiquet-price">
+              <p>254.99</p>
+              <div></div>
+            </div>
+            <div class="benefits-list">
+              <ul>
+                <li><span>Anlysis</span></li>
+                <li><span>Consulting</span></li>
+                <li><span>Consulting</span></li>
+              </ul>
+            </div>
+            <div class="button-get-plan">
+              <a href="#">
+                <span>START PROJECT</span>
+              </a>
             </div>
-            <div class="chart-placeholder" ref="energyTrendChart"></div>
           </div>
         </div>
-        <div class="row">
-          <div class="power-curve-container">
-            <div class="section-header">
-              <div class="header-title">平均电功率曲线</div>
-            </div>
-            <div class="power-chart" ref="powerCurveChart"></div>
-          </div>
-          <!-- <div class="power-peak-container">
-            <div class="section-header">
-              <div class="header-title">电功率峰值</div>
-            </div>
-            <div class="peak-item">
-              <p class="value">{{ peakData.todayPeakPower }}</p>
-              <p class="time">{{ peakData.todayPeakTime }}</p>
-              <div class="bottom-text">当日(kW)</div>
-            </div>
-            <div class="peak-item">
-              <p class="value">{{ peakData.yesterdayPeakPower }}</p>
-              <p class="time">{{ peakData.yesterdayPeakTime }}</p>
-              <div class="bottom-text">昨日(kW)</div>
-            </div>
-          </div> -->
-        </div>
+        <BackTop :target="targetFn"></BackTop>
       </div>
     </div>
   </Page>
 </template>
 
 <style scoped>
-.row {
-  display: flex;
-  gap: 1rem;
-  width: 100%;
-}
-
-.comparison-section-container {
-  flex: 2;
-}
-
-.energy-trend-container {
-  flex: 3;
-}
-
-.power-curve-container {
-  margin-top: 10px;
-  flex: 5;
-}
-
-.power-peak-container {
-  margin-top: 10px;
+/* 右侧内容区域样式 */
+.flex-1 {
   flex: 1;
+  overflow-y: auto; /* 添加垂直滚动条 */
+  padding: 10px;
+  height: 100%; /* 确保高度占满父容器 */
+  box-sizing: border-box; /* 包括padding在高度计算中 */
 }
 
-.energy-trend-top {
+/* 卡片容器样式 */
+.cards-container {
   display: flex;
-  justify-content: space-between;
+  flex-wrap: wrap;
+  justify-content: flex-start;
+  gap: 20px; /* 使用gap替代margin控制间距 */
 }
 
-.section-header {
-  border-left: 4px solid #3671e8;
-  margin-bottom: 15px;
-  padding-left: 16px;
-}
-
-.header-title {
-  font-size: 16px;
-  color: #333;
-}
-
-.comparison-section-container,
-.energy-trend-container,
-.power-curve-container,
-.power-peak-container {
+.plan-card {
   background: #fff;
+  width: 15rem;
+  padding-left: 2rem;
+  padding-right: 2rem;
+  padding-top: 10px;
+  padding-bottom: 20px;
+  border-radius: 10px;
+  border-bottom: 4px solid #87ceeb;
+  box-shadow: 0 6px 30px rgba(173, 216, 230, 0.3);
+  font-family: 'Poppins', sans-serif;
+  height: 306px;
+  margin: 0 5px 20px 5px;
+}
+
+.plan-card h2 {
+  margin-bottom: 15px;
+  font-size: 27px;
+  color: #5faee3;
+  font-weight: 600;
+}
+
+.plan-card h2 span {
+  display: block;
+  margin-top: -4px;
+  color: #7eb8da;
+  font-size: 12px;
+  font-weight: 400;
+}
+
+.etiquet-price {
+  position: relative;
+  background: #f0f8ff;
+  width: 14.46rem;
+  margin-left: -0.65rem;
+  padding: 0.2rem 1.2rem;
+  border-radius: 5px 0 0 5px;
+}
+
+.etiquet-price p {
+  margin: 0;
+  padding-top: 0.4rem;
+  display: flex;
+  font-size: 1.9rem;
+  font-weight: 500;
+  color: #4a8cbb;
+}
+
+.etiquet-price p:before {
+  content: '';
+  margin-right: 5px;
+  font-size: 15px;
+  font-weight: 300;
+}
+
+.etiquet-price p:after {
+  content: '/ KW.H';
+  margin-left: 5px;
+  font-size: 15px;
+  font-weight: 300;
+}
+
+.etiquet-price div {
+  position: absolute;
+  bottom: -23px;
+  right: 0px;
+  width: 0;
+  height: 0;
+  border-top: 13px solid #87ceeb;
+  border-bottom: 10px solid transparent;
+  border-right: 13px solid transparent;
+  z-index: 1;
+}
+
+.benefits-list {
+  margin-top: 16px;
+}
+
+.benefits-list ul {
+  padding: 0;
+  font-size: 14px;
+}
+
+.benefits-list ul li {
+  color: #5a7d9a;
+  list-style: none;
+  margin-bottom: 0.2rem;
+  display: flex;
+  align-items: center;
+  gap: 0.5rem;
+}
+
+.benefits-list ul li svg {
+  width: 0.9rem;
+  fill: currentColor;
+}
+
+.benefits-list ul li span {
+  font-weight: 300;
+}
+
+.button-get-plan {
+  display: flex;
+  justify-content: center;
+  margin-top: 1.2rem;
+}
+
+.button-get-plan a {
+  display: flex;
+  justify-content: center;
+  align-items: center;
+  background: #6bb1e3;
+  color: #fff;
+  padding: 10px 15px;
   border-radius: 5px;
-  box-shadow: 0 2px 8px rgba(0, 0, 0, 0.1);
-  padding: 1rem;
+  text-decoration: none;
+  font-size: 0.8rem;
+  letter-spacing: 0.05rem;
+  font-weight: 500;
+  transition: all 0.3s ease;
 }
 
-.comparison-grid {
-  display: grid;
-  grid-template-columns: repeat(3, 1fr);
-  gap: 5px;
+.button-get-plan a:hover {
+  transform: translateY(-3%);
+  box-shadow: 0 3px 10px rgba(123, 180, 220, 0.6); /* 浅蓝色阴影 */
+  background: #5fa0d0; /* 悬停时略深的蓝色 */
 }
 
-.comparison-item {
-  padding: 5px 10px;
-  border: 1px solid #e0e0e0;
-  text-align: center;
-}
-
-.item-value {
-  font-size: 22px;
-  color: #333;
-  margin-bottom: 10px;
-}
-
-.item-title {
-  font-size: 12px;
-  color: #666;
-}
-
-.item-top {
-  font-size: 16px;
-  margin-bottom: 10px;
-}
-
-.item-percent {
-  color: #7fb926;
-  margin-bottom: 5px;
-  border-bottom: 1px solid #666;
-}
-
-.item-unit {
-  font-size: 12px;
-  color: #999;
-  margin-left: 3px;
-}
-
-.chart-placeholder {
-  height: 36vh;
-  display: flex;
-  align-items: center;
-  justify-content: center;
-  border-radius: 4px;
-}
-
-.power-chart {
-  height: 38vh;
-  display: flex;
-  align-items: center;
-  justify-content: center;
-  border-radius: 4px;
-}
-
-.peak-item {
-  padding: 15px 0 0 0;
-  border: 1px solid #3671e8;
-  text-align: center;
-  margin-bottom: 1rem;
-
-  .bottom-text {
-    background-color: #3671e8;
-    color: white;
-    line-height: 40px;
-  }
-}
-
-.peak-item .value {
-  font-size: 22px;
-  color: #333;
-}
-
-.peak-item .time {
-  font-size: 12px;
-  color: #999;
-  margin: 5px 0;
+.button-get-plan .svg-rocket {
+  margin-right: 10px;
+  width: 0.9rem;
+  fill: currentColor;
 }
 </style>

From 55e57eb219a2512c39d85d17f67fa8ee5b307482 Mon Sep 17 00:00:00 2001
From: zcxlsm <patrickstarlsm@163.com>
Date: Sun, 31 Aug 2025 12:48:27 +0800
Subject: [PATCH 03/30] =?UTF-8?q?feat(property):=20=E6=B7=BB=E5=8A=A0?=
 =?UTF-8?q?=E6=B0=B4=E7=94=B5=E6=B0=94=E8=A1=A8=E5=BD=93=E5=89=8D=E8=AF=BB?=
 =?UTF-8?q?=E6=95=B0=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 新增 currentReading 函数获取水电气表当前读数和状态
- 更新 floor-tree 组件，增加 isMeter 属性控制是否显示电表数据
- 重构 electricitySituation 页面，展示电表当前读数和状态信息
- 优化 waterSituation 页面，引入 floor-tree 组件
---
 .../energyManagement/meterInfo/index.ts       |  13 +-
 .../electricEnergy/components/floor-tree.vue  |  78 ++++++----
 .../elctricitySituation/index.vue             | 140 ++++++++++++------
 .../waterPower/waterSituation/index.vue       |   2 +-
 4 files changed, 155 insertions(+), 78 deletions(-)

diff --git a/apps/web-antd/src/api/property/energyManagement/meterInfo/index.ts b/apps/web-antd/src/api/property/energyManagement/meterInfo/index.ts
index b3c505df..bf722395 100644
--- a/apps/web-antd/src/api/property/energyManagement/meterInfo/index.ts
+++ b/apps/web-antd/src/api/property/energyManagement/meterInfo/index.ts
@@ -1,6 +1,6 @@
 import type { MeterInfoVO, MeterInfoForm, MeterInfoQuery } from './model'
 
-import type { ID, IDS, PageResult, TreeNode } from '#/api/common';
+import type { ID, IDS, PageResult, TreeNode } from '#/api/common'
 
 import { commonExport } from '#/api/helper'
 import { requestClient } from '#/api/request'
@@ -64,6 +64,13 @@ export function meterInfoRemove(id: ID | IDS) {
  * @param level
  * @returns 水电气树
  */
-export function queryTree(meterType: number | string) {
-  return requestClient.get<TreeNode<Number>[]>(`/property/meterInfo/tree/${meterType}`)
+export function queryTree(params?: any) {
+  return requestClient.get<TreeNode<Number>[]>(`/property/meterInfo/tree`, { params })
+}
+
+/**
+ * 获取水/电/气表当前读数/状态
+ */
+export function currentReading(params?: any) {
+  return requestClient.get<MeterInfoVO[]>(`/property/meterInfo/currentReading`, { params })
 }
\ No newline at end of file
diff --git a/apps/web-antd/src/views/property/energyManagement/electricEnergy/components/floor-tree.vue b/apps/web-antd/src/views/property/energyManagement/electricEnergy/components/floor-tree.vue
index 7b99045b..1aedde12 100644
--- a/apps/web-antd/src/views/property/energyManagement/electricEnergy/components/floor-tree.vue
+++ b/apps/web-antd/src/views/property/energyManagement/electricEnergy/components/floor-tree.vue
@@ -1,14 +1,19 @@
 <script setup lang="ts">
-import type { PropType } from "vue";
-import { onMounted, ref } from "vue";
-import { handleNode } from "@vben/utils";
-import { Empty, Skeleton, Tree } from "ant-design-vue";
-import { queryTree } from "#/api/property/energyManagement/meterInfo";
-import type { TreeNode } from "#/api/common";
+import type { PropType } from 'vue';
+import { onMounted, ref } from 'vue';
+import { handleNode } from '@vben/utils';
+import { Empty, Skeleton, Tree } from 'ant-design-vue';
+import { queryTree } from '#/api/property/energyManagement/meterInfo';
+import type { TreeNode } from '#/api/common';
 
 defineOptions({ inheritAttrs: false });
 
-withDefaults(defineProps<{ showSearch?: boolean }>(), { showSearch: true });
+const props = defineProps({
+  isMeter: {
+    type: Boolean,
+    default: true,
+  },
+});
 
 const emit = defineEmits<{
   /**
@@ -23,13 +28,13 @@ const emit = defineEmits<{
   select: [selectedKeys: string[], info: any];
 }>();
 
-const selectTreeId = defineModel("selectTreeId", {
+const selectTreeId = defineModel('selectTreeId', {
   type: Array as PropType<string[]>,
 });
 
-const searchValue = defineModel("searchValue", {
+const searchValue = defineModel('searchValue', {
   type: String,
-  default: "",
+  default: '',
 });
 
 const treeArray = ref<TreeNode[]>([]);
@@ -38,8 +43,8 @@ const showTreeSkeleton = ref<boolean>(true);
 
 async function loadTree() {
   showTreeSkeleton.value = true;
-  searchValue.value = "";
-  const ret = await queryTree(1);
+  searchValue.value = '';
+  const ret = await queryTree({ meterType: 1, isMeter: props.isMeter });
   handleNode(ret, 3);
   treeArray.value = ret;
   showTreeSkeleton.value = false;
@@ -62,33 +67,46 @@ onMounted(loadTree);
 
 <template>
   <div :class="$attrs.class">
-    <Skeleton :loading="showTreeSkeleton"
-              :paragraph="{ rows: 8 }"
-              active
-              class="p-[8px] flex-1 min-h-0">
-      <div class="bg-background flex h-full flex-col overflow-y-auto rounded-lg">
+    <Skeleton
+      :loading="showTreeSkeleton"
+      :paragraph="{ rows: 8 }"
+      active
+      class="min-h-0 flex-1 p-[8px]"
+    >
+      <div
+        class="bg-background flex h-full flex-col overflow-y-auto rounded-lg"
+      >
         <div class="h-full overflow-x-hidden px-[8px]">
-          <Tree v-bind="$attrs"
-                v-if="treeArray.length > 0"
-                v-model:selected-keys="selectTreeId"
-                :show-line="{ showLeafIcon: false }"
-                :tree-data="treeArray"
-                :virtual="false"
-                default-expand-all
-                @select="(selectedKeys, info) => $emit('select', selectedKeys, info)">
+          <Tree
+            v-bind="$attrs"
+            v-if="treeArray.length > 0"
+            v-model:selected-keys="selectTreeId"
+            :show-line="{ showLeafIcon: false }"
+            :tree-data="treeArray"
+            :virtual="false"
+            default-expand-all
+            @select="
+              (selectedKeys, info) => $emit('select', selectedKeys, info)
+            "
+          >
             <template #title="{ label }">
               <span v-if="label.indexOf(searchValue) > -1">
                 {{ label.substring(0, label.indexOf(searchValue)) }}
                 <span style="color: #f50">{{ searchValue }}</span>
-                {{ label.substring(label.indexOf(searchValue) + searchValue.length) }}
+                {{
+                  label.substring(
+                    label.indexOf(searchValue) + searchValue.length,
+                  )
+                }}
               </span>
               <span v-else>{{ label }}</span>
             </template>
           </Tree>
-          <div v-else
-               class="mt-5">
-            <Empty :image="Empty.PRESENTED_IMAGE_SIMPLE"
-                   description="暂无数据" />
+          <div v-else class="mt-5">
+            <Empty
+              :image="Empty.PRESENTED_IMAGE_SIMPLE"
+              description="暂无数据"
+            />
           </div>
         </div>
       </div>
diff --git a/apps/web-antd/src/views/property/energyManagement/electricEnergy/elctricitySituation/index.vue b/apps/web-antd/src/views/property/energyManagement/electricEnergy/elctricitySituation/index.vue
index d3cfa605..a66b513b 100644
--- a/apps/web-antd/src/views/property/energyManagement/electricEnergy/elctricitySituation/index.vue
+++ b/apps/web-antd/src/views/property/energyManagement/electricEnergy/elctricitySituation/index.vue
@@ -1,50 +1,91 @@
 <script setup lang="ts">
 import { Page } from '@vben/common-ui';
-import { BackTop } from 'ant-design-vue';
+import { BackTop, message, Spin } from 'ant-design-vue';
 import { ref, onMounted, onBeforeUnmount, reactive } from 'vue';
 import FloorTree from '../components/floor-tree.vue';
-import { meterRecordTrend } from '#/api/property/energyManagement/meterRecord';
+import { currentReading } from '#/api/property/energyManagement/meterInfo';
 
 onMounted(() => {});
 
 onBeforeUnmount(() => {});
 
-const trendData = ref<any>({});
-async function handleSelectFloor(selectedKeys, info) {}
+const readingData = ref<any>({});
+const readingTime = ref('');
+let readingLoading = ref(false);
+async function handleSelectFloor(selectedKeys, info) {
+  if (typeof selectedKeys[0] === 'undefined') {
+    return;
+  }
+  readingLoading.value = true;
+  const reading = await currentReading({
+    meterType: 1,
+    floorId: selectedKeys[0],
+  });
+  readingLoading.value = false;
+  if (reading === null) {
+    message.warn('当前楼层暂无电表数据！');
+  }
+  const nowTime =
+    new Date().toLocaleDateString().replace(/\//g, '-') +
+    ' ' +
+    new Date().toLocaleTimeString();
+  readingTime.value = nowTime;
+  readingData.value = reading;
+}
 
- function targetFn () {
-   return document.querySelector('.flex-1')
- }
+function targetFn() {
+  return document.getElementById('right-panel');
+}
 </script>
 
 <template>
   <Page :auto-content-height="true">
     <div class="flex h-full gap-[8px]">
-      <FloorTree class="w-[260px]" @select="handleSelectFloor"></FloorTree>
-      <div class="flex-1">
-        <div class="cards-container">
-          <div v-for="item in 50" class="plan-card">
-            <h2>4楼电表1号<span>For business sedrvices</span></h2>
-            <div class="etiquet-price">
-              <p>254.99</p>
-              <div></div>
-            </div>
-            <div class="benefits-list">
-              <ul>
-                <li><span>Anlysis</span></li>
-                <li><span>Consulting</span></li>
-                <li><span>Consulting</span></li>
-              </ul>
-            </div>
-            <div class="button-get-plan">
-              <a href="#">
-                <span>START PROJECT</span>
-              </a>
+      <FloorTree
+        :isMeter="false"
+        class="w-[260px]"
+        @select="handleSelectFloor"
+      ></FloorTree>
+      <div class="flex-1" id="right-panel">
+        <Spin :spinning="readingLoading" size="large" style="height: 100px">
+          <div class="cards-container">
+            <div v-for="item in readingData" class="meterInfo-card">
+              <h2>
+                {{ item.meterName }}<span>{{ item.installLocation }}</span>
+              </h2>
+              <div class="meterInfo-reading">
+                <p>{{ item.initReading }}</p>
+                <div></div>
+              </div>
+              <div class="meterInfo-list">
+                <ul>
+                  <li>
+                    <span>时间：</span>
+                    <span>{{ readingTime }}</span>
+                  </li>
+                  <li>
+                    <span>采集器IP：</span>
+                    <span>{{ item.hostIp }}</span>
+                  </li>
+                </ul>
+              </div>
+              <div class="button-get-plan">
+                <a
+                  href="#"
+                  v-if="item.communicationState !== 0"
+                  style="background: #6bb1e3"
+                >
+                  <span>在线</span>
+                </a>
+                <a href="#" v-else style="background: orange">
+                  <span>离线</span>
+                </a>
+              </div>
             </div>
           </div>
-        </div>
-        <BackTop :target="targetFn"></BackTop>
+        </Spin>
       </div>
+      <BackTop class="back-to-top" :target="targetFn"></BackTop>
     </div>
   </Page>
 </template>
@@ -67,7 +108,7 @@ async function handleSelectFloor(selectedKeys, info) {}
   gap: 20px; /* 使用gap替代margin控制间距 */
 }
 
-.plan-card {
+.meterInfo-card {
   background: #fff;
   width: 15rem;
   padding-left: 2rem;
@@ -78,18 +119,18 @@ async function handleSelectFloor(selectedKeys, info) {}
   border-bottom: 4px solid #87ceeb;
   box-shadow: 0 6px 30px rgba(173, 216, 230, 0.3);
   font-family: 'Poppins', sans-serif;
-  height: 306px;
+  height: 290px;
   margin: 0 5px 20px 5px;
 }
 
-.plan-card h2 {
+.meterInfo-card h2 {
   margin-bottom: 15px;
   font-size: 27px;
   color: #5faee3;
   font-weight: 600;
 }
 
-.plan-card h2 span {
+.meterInfo-card h2 span {
   display: block;
   margin-top: -4px;
   color: #7eb8da;
@@ -97,7 +138,7 @@ async function handleSelectFloor(selectedKeys, info) {}
   font-weight: 400;
 }
 
-.etiquet-price {
+.meterInfo-reading {
   position: relative;
   background: #f0f8ff;
   width: 14.46rem;
@@ -106,7 +147,7 @@ async function handleSelectFloor(selectedKeys, info) {}
   border-radius: 5px 0 0 5px;
 }
 
-.etiquet-price p {
+.meterInfo-reading p {
   margin: 0;
   padding-top: 0.4rem;
   display: flex;
@@ -115,21 +156,21 @@ async function handleSelectFloor(selectedKeys, info) {}
   color: #4a8cbb;
 }
 
-.etiquet-price p:before {
+.meterInfo-reading p:before {
   content: '';
   margin-right: 5px;
   font-size: 15px;
   font-weight: 300;
 }
 
-.etiquet-price p:after {
+.meterInfo-reading p:after {
   content: '/ KW.H';
   margin-left: 5px;
   font-size: 15px;
   font-weight: 300;
 }
 
-.etiquet-price div {
+.meterInfo-reading div {
   position: absolute;
   bottom: -23px;
   right: 0px;
@@ -141,16 +182,16 @@ async function handleSelectFloor(selectedKeys, info) {}
   z-index: 1;
 }
 
-.benefits-list {
+.meterInfo-list {
   margin-top: 16px;
 }
 
-.benefits-list ul {
+.meterInfo-list ul {
   padding: 0;
   font-size: 14px;
 }
 
-.benefits-list ul li {
+.meterInfo-list ul li {
   color: #5a7d9a;
   list-style: none;
   margin-bottom: 0.2rem;
@@ -159,12 +200,12 @@ async function handleSelectFloor(selectedKeys, info) {}
   gap: 0.5rem;
 }
 
-.benefits-list ul li svg {
+.meterInfo-list ul li svg {
   width: 0.9rem;
   fill: currentColor;
 }
 
-.benefits-list ul li span {
+.meterInfo-list ul li span {
   font-weight: 300;
 }
 
@@ -178,7 +219,7 @@ async function handleSelectFloor(selectedKeys, info) {}
   display: flex;
   justify-content: center;
   align-items: center;
-  background: #6bb1e3;
+
   color: #fff;
   padding: 10px 15px;
   border-radius: 5px;
@@ -200,4 +241,15 @@ async function handleSelectFloor(selectedKeys, info) {}
   width: 0.9rem;
   fill: currentColor;
 }
+
+.back-to-top {
+  width: 50px;
+  height: 50px;
+}
+
+/* 返回顶部按钮 */
+.back-to-top:hover {
+  background-color: #6bb1e3;
+  transform: translateY(-5px);
+}
 </style>
diff --git a/apps/web-antd/src/views/property/energyManagement/waterPower/waterSituation/index.vue b/apps/web-antd/src/views/property/energyManagement/waterPower/waterSituation/index.vue
index 76cfbcc9..463db550 100644
--- a/apps/web-antd/src/views/property/energyManagement/waterPower/waterSituation/index.vue
+++ b/apps/web-antd/src/views/property/energyManagement/waterPower/waterSituation/index.vue
@@ -81,7 +81,7 @@ import { Page } from '@vben/common-ui'
 import { ref, onMounted, onBeforeUnmount, reactive } from 'vue'
 import * as echarts from 'echarts'
 import type { ECharts, EChartsOption } from 'echarts'
-import FloorTree from "../../electricEnergy/components/floor-tree.vue"
+import FloorTree from "../components/floor-tree.vue"
 
 const chainData = reactive({
   currentMonthEnergy: '9',

From ee6aa163d973f9fdd500c748b9b4538d7feeba2d Mon Sep 17 00:00:00 2001
From: zcxlsm <patrickstarlsm@163.com>
Date: Sun, 31 Aug 2025 16:16:19 +0800
Subject: [PATCH 04/30] =?UTF-8?q?refactor(web-antd):=20=E4=BC=98=E5=8C=96?=
 =?UTF-8?q?=E7=94=B5=E8=A1=A8=E4=BF=A1=E6=81=AF=E5=8D=A1=E7=89=87=E7=9A=84?=
 =?UTF-8?q?=E6=A0=B7=E5=BC=8F=E5=92=8C=E5=86=85=E5=AE=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../electricEnergy/elctricitySituation/index.vue   | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/apps/web-antd/src/views/property/energyManagement/electricEnergy/elctricitySituation/index.vue b/apps/web-antd/src/views/property/energyManagement/electricEnergy/elctricitySituation/index.vue
index a66b513b..c4a2fef2 100644
--- a/apps/web-antd/src/views/property/energyManagement/electricEnergy/elctricitySituation/index.vue
+++ b/apps/web-antd/src/views/property/energyManagement/electricEnergy/elctricitySituation/index.vue
@@ -51,7 +51,7 @@ function targetFn() {
           <div class="cards-container">
             <div v-for="item in readingData" class="meterInfo-card">
               <h2>
-                {{ item.meterName }}<span>{{ item.installLocation }}</span>
+                {{ item.meterName }}
               </h2>
               <div class="meterInfo-reading">
                 <p>{{ item.initReading }}</p>
@@ -60,24 +60,23 @@ function targetFn() {
               <div class="meterInfo-list">
                 <ul>
                   <li>
-                    <span>时间：</span>
+                    <span>采集时间：</span>
                     <span>{{ readingTime }}</span>
                   </li>
                   <li>
-                    <span>采集器IP：</span>
-                    <span>{{ item.hostIp }}</span>
+                    <span>设备位置：</span>
+                    <span>{{ item.installLocation }}</span>
                   </li>
                 </ul>
               </div>
               <div class="button-get-plan">
                 <a
-                  href="#"
                   v-if="item.communicationState !== 0"
                   style="background: #6bb1e3"
                 >
                   <span>在线</span>
                 </a>
-                <a href="#" v-else style="background: orange">
+                <a v-else style="background: orange">
                   <span>离线</span>
                 </a>
               </div>
@@ -119,7 +118,7 @@ function targetFn() {
   border-bottom: 4px solid #87ceeb;
   box-shadow: 0 6px 30px rgba(173, 216, 230, 0.3);
   font-family: 'Poppins', sans-serif;
-  height: 290px;
+  height: 270px;
   margin: 0 5px 20px 5px;
 }
 
@@ -207,6 +206,7 @@ function targetFn() {
 
 .meterInfo-list ul li span {
   font-weight: 300;
+  white-space: nowrap;
 }
 
 .button-get-plan {

From b91d073b8dd25b1cea6f75add8a0b8d8d12b67dd Mon Sep 17 00:00:00 2001
From: zcxlsm <patrickstarlsm@163.com>
Date: Mon, 1 Sep 2025 18:09:56 +0800
Subject: [PATCH 05/30] =?UTF-8?q?feat(web-antd):=20=E5=AE=9E=E7=8E=B0?=
 =?UTF-8?q?=E7=94=B5=E8=A1=A8=E6=95=B0=E6=8D=AE=E5=AE=9E=E6=97=B6=E6=8E=A8?=
 =?UTF-8?q?=E9=80=81=E5=8A=9F=E8=83=BD=20-=20=E6=96=B0=E5=A2=9E=20WebSocke?=
 =?UTF-8?q?t=20=E6=9C=8D=E5=8A=A1=EF=BC=8C=E7=94=A8=E4=BA=8E=E6=8E=A5?=
 =?UTF-8?q?=E6=94=B6=E5=AE=9E=E6=97=B6=E6=8E=A8=E9=80=81=E7=9A=84=E7=94=B5?=
 =?UTF-8?q?=E8=A1=A8=E6=95=B0=E6=8D=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 apps/web-antd/.env.development                |   2 +
 apps/web-antd/.env.production                 |   2 +
 .../energyManagement/meterInfo/index.ts       |   2 +-
 apps/web-antd/src/api/websocket.ts            | 162 ++++++++++++++++++
 apps/web-antd/src/bootstrap.ts                |  71 ++++----
 .../elctricitySituation/index.vue             |  61 +++++--
 6 files changed, 251 insertions(+), 49 deletions(-)
 create mode 100644 apps/web-antd/src/api/websocket.ts

diff --git a/apps/web-antd/.env.development b/apps/web-antd/.env.development
index d522a706..aa18ed97 100644
--- a/apps/web-antd/.env.development
+++ b/apps/web-antd/.env.development
@@ -20,6 +20,8 @@ VITE_GLOB_RSA_PUBLIC_KEY=MFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBAKoR8mX0rGKLqzcWmOzbfj6
 VITE_GLOB_RSA_PRIVATE_KEY=MIIBVAIBADANBgkqhkiG9w0BAQEFAASCAT4wggE6AgEAAkEAmc3CuPiGL/LcIIm7zryCEIbl1SPzBkr75E2VMtxegyZ1lYRD+7TZGAPkvIsBcaMs6Nsy0L78n2qh+lIZMpLH8wIDAQABAkEAk82Mhz0tlv6IVCyIcw/s3f0E+WLmtPFyR9/WtV3Y5aaejUkU60JpX4m5xNR2VaqOLTZAYjW8Wy0aXr3zYIhhQQIhAMfqR9oFdYw1J9SsNc+CrhugAvKTi0+BF6VoL6psWhvbAiEAxPPNTmrkmrXwdm/pQQu3UOQmc2vCZ5tiKpW10CgJi8kCIFGkL6utxw93Ncj4exE/gPLvKcT+1Emnoox+O9kRXss5AiAMtYLJDaLEzPrAWcZeeSgSIzbL+ecokmFKSDDcRske6QIgSMkHedwND1olF8vlKsJUGK3BcdtM8w4Xq7BpSBwsloE=
 # 客户端id
 VITE_GLOB_APP_CLIENT_ID=e5cd7e4891bf95d1d19206ce24a7b32e
+# 开启WEBSOCKET
+VITE_APP_WEBSOCKET=true
 
 # 开启SSE
 VITE_GLOB_SSE_ENABLE=true
diff --git a/apps/web-antd/.env.production b/apps/web-antd/.env.production
index d228ac48..a26175cd 100644
--- a/apps/web-antd/.env.production
+++ b/apps/web-antd/.env.production
@@ -26,6 +26,8 @@ VITE_GLOB_RSA_PUBLIC_KEY=MFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBAKoR8mX0rGKLqzcWmOzbfj6
 VITE_GLOB_RSA_PRIVATE_KEY=MIIBVAIBADANBgkqhkiG9w0BAQEFAASCAT4wggE6AgEAAkEAmc3CuPiGL/LcIIm7zryCEIbl1SPzBkr75E2VMtxegyZ1lYRD+7TZGAPkvIsBcaMs6Nsy0L78n2qh+lIZMpLH8wIDAQABAkEAk82Mhz0tlv6IVCyIcw/s3f0E+WLmtPFyR9/WtV3Y5aaejUkU60JpX4m5xNR2VaqOLTZAYjW8Wy0aXr3zYIhhQQIhAMfqR9oFdYw1J9SsNc+CrhugAvKTi0+BF6VoL6psWhvbAiEAxPPNTmrkmrXwdm/pQQu3UOQmc2vCZ5tiKpW10CgJi8kCIFGkL6utxw93Ncj4exE/gPLvKcT+1Emnoox+O9kRXss5AiAMtYLJDaLEzPrAWcZeeSgSIzbL+ecokmFKSDDcRske6QIgSMkHedwND1olF8vlKsJUGK3BcdtM8w4Xq7BpSBwsloE=
 # 客户端id
 VITE_GLOB_APP_CLIENT_ID=e5cd7e4891bf95d1d19206ce24a7b32e
+# 开启WEBSOCKET
+VITE_APP_WEBSOCKET=true
 
 # 开启SSE
 VITE_GLOB_SSE_ENABLE=true
diff --git a/apps/web-antd/src/api/property/energyManagement/meterInfo/index.ts b/apps/web-antd/src/api/property/energyManagement/meterInfo/index.ts
index bf722395..b6af3266 100644
--- a/apps/web-antd/src/api/property/energyManagement/meterInfo/index.ts
+++ b/apps/web-antd/src/api/property/energyManagement/meterInfo/index.ts
@@ -72,5 +72,5 @@ export function queryTree(params?: any) {
  * 获取水/电/气表当前读数/状态
  */
 export function currentReading(params?: any) {
-  return requestClient.get<MeterInfoVO[]>(`/property/meterInfo/currentReading`, { params })
+  return requestClient.get<void>(`/property/meterInfo/currentReading`, { params })
 }
\ No newline at end of file
diff --git a/apps/web-antd/src/api/websocket.ts b/apps/web-antd/src/api/websocket.ts
new file mode 100644
index 00000000..8a136fbb
--- /dev/null
+++ b/apps/web-antd/src/api/websocket.ts
@@ -0,0 +1,162 @@
+import { useAccessStore } from '@vben/stores';
+
+interface WebSocketCallbacks {
+  onOpen?: (event: Event) => void;
+  onMessage?: (event: MessageEvent) => void;
+  onError?: (error: Event) => void;
+  onClose?: (event: CloseEvent) => void;
+}
+
+export default class WebSocketService {
+  private webSocket: WebSocket | null = null;
+  private webSocketURL: string = '';
+  
+  // 默认回调函数
+  private onOpenCallback: (event: Event) => void;
+  private onMessageCallback: (event: MessageEvent) => void;
+  private onErrorCallback: (error: Event) => void;
+  private onCloseCallback: (event: CloseEvent) => void;
+
+  constructor(callbacks?: WebSocketCallbacks) {
+    // 设置回调函数，使用自定义回调或默认回调
+    this.onOpenCallback = callbacks?.onOpen || this.defaultOnOpen;
+    this.onMessageCallback = callbacks?.onMessage || this.defaultOnMessage;
+    this.onErrorCallback = callbacks?.onError || this.defaultOnError;
+    this.onCloseCallback = callbacks?.onClose || this.defaultOnClose;
+  }
+
+  // 初始化WebSocket连接
+  initWebSocket(webSocketURL: string): void {
+    this.webSocketURL = webSocketURL;
+    try {
+      this.webSocket = new WebSocket(webSocketURL);
+      
+      this.webSocket.onopen = this.onOpenCallback;
+      this.webSocket.onmessage = this.onMessageCallback;
+      this.webSocket.onerror = this.onErrorCallback;
+      this.webSocket.onclose = this.onCloseCallback;
+    } catch (error) {
+      console.error('Failed to initialize WebSocket:', error);
+    }
+  }
+  
+  // 设置onOpen回调并更新WebSocket事件处理器
+  setOnOpenCallback(callback: (event: Event) => void): void {
+    this.onOpenCallback = callback;
+    if (this.webSocket) {
+      this.webSocket.onopen = this.onOpenCallback;
+    }
+  }
+
+  // 设置onMessage回调并更新WebSocket事件处理器
+  setOnMessageCallback(callback: (event: MessageEvent) => void): void {
+    this.onMessageCallback = callback;
+    if (this.webSocket) {
+      this.webSocket.onmessage = this.onMessageCallback;
+    }
+  }
+
+  // 设置onError回调并更新WebSocket事件处理器
+  setOnErrorCallback(callback: (error: Event) => void): void {
+    this.onErrorCallback = callback;
+    if (this.webSocket) {
+      this.webSocket.onerror = this.onErrorCallback;
+    }
+  }
+
+  // 设置onClose回调并更新WebSocket事件处理器
+  setOnCloseCallback(callback: (event: CloseEvent) => void): void {
+    this.onCloseCallback = callback;
+    if (this.webSocket) {
+      this.webSocket.onclose = this.onCloseCallback;
+    }
+  }
+
+  // 默认连接建立成功的回调
+  private defaultOnOpen(event: Event): void {
+    console.log('WebSocket连接建立成功', event);
+  }
+
+  // 默认收到服务器消息的回调
+  private defaultOnMessage(event: MessageEvent): void {
+    console.log('收到服务器消息', event.data);
+    // 通常这里会解析数据并更新页面
+    // const data = JSON.parse(event.data);
+    // 根据消息类型处理不同业务...
+  }
+
+  // 默认发生错误的回调
+  private defaultOnError(error: Event): void {
+    console.error('WebSocket连接错误', error);
+  }
+
+  // 默认连接关闭的回调
+  private defaultOnClose(event: CloseEvent): void {
+    console.log('WebSocket连接关闭', event);
+  }
+
+  // 关闭连接
+  close(): void {
+    if (this.webSocket) {
+      this.webSocket.close();
+      this.webSocket = null;
+    }
+  }
+
+  // 发送消息
+  sendMessage(message: string | object): void {
+    if (this.webSocket && this.webSocket.readyState === WebSocket.OPEN) {
+      const dataToSend = typeof message === 'string' ? message : JSON.stringify(message);
+      this.webSocket.send(dataToSend);
+    } else {
+      console.error('WebSocket连接未就绪');
+    }
+  }
+
+  // 获取当前WebSocket状态
+  getReadyState(): number | null {
+    return this.webSocket ? this.webSocket.readyState : null;
+  }
+
+  // 获取WebSocket URL
+  getWebSocketURL(): string {
+    return this.webSocketURL;
+  }
+
+  // 重新连接
+  reconnect(): void {
+    if (this.webSocketURL) {
+      this.close();
+      this.initWebSocket(this.webSocketURL);
+    }
+  }
+}
+
+// 创建一个可导出的WebSocket实例
+let globalWebSocketService: WebSocketService | null = null;
+
+/**
+ * 初始化WebSocket连接的可导出方法
+ * @param url WebSocket服务器地址
+ * @param callbacks 回调函数对象（可选）
+ * @returns WebSocketService实例
+ */
+export function initWebSocket(callbacks?: WebSocketCallbacks): void {
+  if (!globalWebSocketService) {
+    globalWebSocketService = new WebSocketService(callbacks);
+  }
+  const accessStore = useAccessStore();
+  const clinetId = import.meta.env.VITE_GLOB_APP_CLIENT_ID;
+  const api = import.meta.env.VITE_GLOB_API_URL;
+  const host = window.location.host;
+  const url = `ws://${host}${api}/resource/websocket?clientid=${clinetId}&Authorization=Bearer ${accessStore.accessToken}`;
+  globalWebSocketService.initWebSocket(url);
+}
+
+/**
+ * 获取全局WebSocket服务实例
+ * @returns WebSocketService实例或null
+ */
+export function getWebSocketService(): WebSocketService | null {
+  return globalWebSocketService;
+}
\ No newline at end of file
diff --git a/apps/web-antd/src/bootstrap.ts b/apps/web-antd/src/bootstrap.ts
index 45d2df24..e1c883d1 100644
--- a/apps/web-antd/src/bootstrap.ts
+++ b/apps/web-antd/src/bootstrap.ts
@@ -1,30 +1,31 @@
-import { createApp, watchEffect } from 'vue';
+import { createApp, watchEffect } from 'vue'
 
-import { registerAccessDirective } from '@vben/access';
-import { registerLoadingDirective } from '@vben/common-ui/es/loading';
-import { preferences } from '@vben/preferences';
-import { initStores } from '@vben/stores';
-import '@vben/styles';
-import '@vben/styles/antd';
+import { registerAccessDirective } from '@vben/access'
+import { registerLoadingDirective } from '@vben/common-ui/es/loading'
+import { preferences } from '@vben/preferences'
+import { initStores } from '@vben/stores'
+import '@vben/styles'
+import '@vben/styles/antd'
 
-import { useTitle } from '@vueuse/core';
+import { useTitle } from '@vueuse/core'
 
-import { setupGlobalComponent } from '#/components/global';
-import { $t, setupI18n } from '#/locales';
+import { setupGlobalComponent } from '#/components/global'
+import { $t, setupI18n } from '#/locales'
 
-import { initComponentAdapter } from './adapter/component';
-import { initSetupVbenForm } from './adapter/form';
-import App from './app.vue';
-import { router } from './router';
+import { initComponentAdapter } from './adapter/component'
+import { initSetupVbenForm } from './adapter/form'
+import App from './app.vue'
+import { router } from './router'
+import { initWebSocket } from '#/api/websocket'
 
 
 
 async function bootstrap(namespace: string) {
   // 初始化组件适配器
-  await initComponentAdapter();
+  await initComponentAdapter()
 
   // 初始化表单组件
-  await initSetupVbenForm();
+  await initSetupVbenForm()
 
   // // 设置弹窗的默认配置
   // setDefaultModalProps({
@@ -35,49 +36,53 @@ async function bootstrap(namespace: string) {
   //   zIndex: 1020,
   // });
 
-  const app = createApp(App);
+
+  const app = createApp(App)
 
   // 全局组件
-  setupGlobalComponent(app);
+  setupGlobalComponent(app)
   // 注册v-loading指令
   registerLoadingDirective(app, {
     loading: 'loading', // 在这里可以自定义指令名称，也可以明确提供false表示不注册这个指令
     spinning: 'spinning',
-  });
+  })
 
 
   // 国际化 i18n 配置
-  await setupI18n(app);
+  await setupI18n(app)
 
   // 配置 pinia-tore
-  await initStores(app, { namespace });
+  await initStores(app, { namespace })
+
+  // 初始化WebSocket
+  initWebSocket()
 
   // 安装权限指令
-  registerAccessDirective(app);
+  registerAccessDirective(app)
 
   // 初始化 tippy
-  const { initTippy } = await import('@vben/common-ui/es/tippy');
-  initTippy(app);
+  const { initTippy } = await import('@vben/common-ui/es/tippy')
+  initTippy(app)
 
   // 配置路由及路由守卫
-  app.use(router);
+  app.use(router)
 
 
   // 配置Motion插件
-  const { MotionPlugin } = await import('@vben/plugins/motion');
-  app.use(MotionPlugin);
+  const { MotionPlugin } = await import('@vben/plugins/motion')
+  app.use(MotionPlugin)
 
   // 动态更新标题
   watchEffect(() => {
     if (preferences.app.dynamicTitle) {
-      const routeTitle = router.currentRoute.value.meta?.title;
+      const routeTitle = router.currentRoute.value.meta?.title
       const pageTitle =
-        (routeTitle ? `${$t(routeTitle)} - ` : '') + preferences.app.name;
-      useTitle(pageTitle);
+        (routeTitle ? `${$t(routeTitle)} - ` : '') + preferences.app.name
+      useTitle(pageTitle)
     }
-  });
+  })
 
-  app.mount('#app');
+  app.mount('#app')
 }
 
-export { bootstrap };
+export { bootstrap }
diff --git a/apps/web-antd/src/views/property/energyManagement/electricEnergy/elctricitySituation/index.vue b/apps/web-antd/src/views/property/energyManagement/electricEnergy/elctricitySituation/index.vue
index c4a2fef2..4b6b1c7d 100644
--- a/apps/web-antd/src/views/property/energyManagement/electricEnergy/elctricitySituation/index.vue
+++ b/apps/web-antd/src/views/property/energyManagement/electricEnergy/elctricitySituation/index.vue
@@ -1,13 +1,44 @@
 <script setup lang="ts">
-import { Page } from '@vben/common-ui';
+import { useAccessStore } from '@vben/stores';
 import { BackTop, message, Spin } from 'ant-design-vue';
+import { Page, VbenCountToAnimator } from '@vben/common-ui';
 import { ref, onMounted, onBeforeUnmount, reactive } from 'vue';
 import FloorTree from '../components/floor-tree.vue';
+import { getWebSocketService } from '#/api/websocket';
 import { currentReading } from '#/api/property/energyManagement/meterInfo';
 
-onMounted(() => {});
+const ws = getWebSocketService();
 
-onBeforeUnmount(() => {});
+if (ws) {
+  // 使用setOnMessageCallback方法设置消息回调
+  ws.setOnMessageCallback((event: MessageEvent) => {
+    // 解析数据并更新UI
+    try {
+      const data = JSON.parse(event.data);
+      if (data.type === 'meter') {
+        if (typeof data.data === 'undefined') {
+          message.warn('当前楼层暂无电表！');
+        }
+        readingData.value = data.data;
+        readingTime.value = data.readingTime;
+      }
+    } catch (e) {
+      console.error('Error parsing data:');
+    }
+    readingLoading.value = false;
+  });
+
+  // 如果需要，也可以设置错误回调
+  ws.setOnErrorCallback((error: any) => {
+    console.log('Error in WebSocket:');
+    currentReading({ meterType: 0, floorId: 0 });
+    readingLoading.value = false;
+  });
+}
+
+onBeforeUnmount(() => {
+  currentReading({ meterType: 0, floorId: 0 });
+});
 
 const readingData = ref<any>({});
 const readingTime = ref('');
@@ -16,21 +47,15 @@ async function handleSelectFloor(selectedKeys, info) {
   if (typeof selectedKeys[0] === 'undefined') {
     return;
   }
+  if (ws.webSocket.readyState !== 1) {
+    message.warn('websocket未连接！请刷新页面重试！');
+    return;
+  }
   readingLoading.value = true;
-  const reading = await currentReading({
+  await currentReading({
     meterType: 1,
     floorId: selectedKeys[0],
   });
-  readingLoading.value = false;
-  if (reading === null) {
-    message.warn('当前楼层暂无电表数据！');
-  }
-  const nowTime =
-    new Date().toLocaleDateString().replace(/\//g, '-') +
-    ' ' +
-    new Date().toLocaleTimeString();
-  readingTime.value = nowTime;
-  readingData.value = reading;
 }
 
 function targetFn() {
@@ -54,7 +79,13 @@ function targetFn() {
                 {{ item.meterName }}
               </h2>
               <div class="meterInfo-reading">
-                <p>{{ item.initReading }}</p>
+                <p>
+                  <VbenCountToAnimator
+                    :end-val="item.initReading"
+                    :decimals="2"
+                    prefix=""
+                  />
+                </p>
                 <div></div>
               </div>
               <div class="meterInfo-list">

From ea3b61ea8b21f56489a0c90ff9f63735976d7660 Mon Sep 17 00:00:00 2001
From: zcxlsm <patrickstarlsm@163.com>
Date: Tue, 2 Sep 2025 14:56:41 +0800
Subject: [PATCH 06/30] =?UTF-8?q?refactor(web-antd):=20=E4=BC=98=E5=8C=96?=
 =?UTF-8?q?=20WebSocket=20=E5=88=9D=E5=A7=8B=E5=8C=96=E5=92=8C=E7=AE=A1?=
 =?UTF-8?q?=E7=90=86=20-=20=E5=9C=A8=20auth=20store=20=E4=B8=AD=E6=B7=BB?=
 =?UTF-8?q?=E5=8A=A0=20WebSocket=20=E5=88=9D=E5=A7=8B=E5=8C=96=E5=92=8C?=
 =?UTF-8?q?=E6=96=AD=E5=BC=80=E9=80=BB=E8=BE=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 apps/web-antd/src/bootstrap.ts  |   4 --
 apps/web-antd/src/store/auth.ts | 111 ++++++++++++++++++--------------
 2 files changed, 63 insertions(+), 52 deletions(-)

diff --git a/apps/web-antd/src/bootstrap.ts b/apps/web-antd/src/bootstrap.ts
index e1c883d1..41501005 100644
--- a/apps/web-antd/src/bootstrap.ts
+++ b/apps/web-antd/src/bootstrap.ts
@@ -16,7 +16,6 @@ import { initComponentAdapter } from './adapter/component'
 import { initSetupVbenForm } from './adapter/form'
 import App from './app.vue'
 import { router } from './router'
-import { initWebSocket } from '#/api/websocket'
 
 
 
@@ -54,9 +53,6 @@ async function bootstrap(namespace: string) {
   // 配置 pinia-tore
   await initStores(app, { namespace })
 
-  // 初始化WebSocket
-  initWebSocket()
-
   // 安装权限指令
   registerAccessDirective(app)
 
diff --git a/apps/web-antd/src/store/auth.ts b/apps/web-antd/src/store/auth.ts
index cd8c4b9f..56a6fdd2 100644
--- a/apps/web-antd/src/store/auth.ts
+++ b/apps/web-antd/src/store/auth.ts
@@ -1,27 +1,29 @@
-import type { LoginAndRegisterParams } from '@vben/common-ui';
-import type { UserInfo } from '@vben/types';
+import type { LoginAndRegisterParams } from '@vben/common-ui'
+import type { UserInfo } from '@vben/types'
 
-import { ref } from 'vue';
-import { useRouter } from 'vue-router';
+import { ref } from 'vue'
+import { useRouter } from 'vue-router'
 
-import { LOGIN_PATH } from '@vben/constants';
-import { preferences } from '@vben/preferences';
-import { resetAllStores, useAccessStore, useUserStore } from '@vben/stores';
+import { LOGIN_PATH } from '@vben/constants'
+import { preferences } from '@vben/preferences'
+import { resetAllStores, useAccessStore, useUserStore } from '@vben/stores'
 
-import { notification } from 'ant-design-vue';
-import { defineStore } from 'pinia';
+import { notification } from 'ant-design-vue'
+import { defineStore } from 'pinia'
 
-import { doLogout, getUserInfoApi, loginApi, seeConnectionClose } from '#/api';
-import { $t } from '#/locales';
+import { doLogout, getUserInfoApi, loginApi, seeConnectionClose } from '#/api'
+import { $t } from '#/locales'
 
-import { useDictStore } from './dict';
+import { useDictStore } from './dict'
+
+import { initWebSocket, getWebSocketService } from '#/api/websocket'
 
 export const useAuthStore = defineStore('auth', () => {
-  const accessStore = useAccessStore();
-  const userStore = useUserStore();
-  const router = useRouter();
+  const accessStore = useAccessStore()
+  const userStore = useUserStore()
+  const router = useRouter()
 
-  const loginLoading = ref(false);
+  const loginLoading = ref(false)
 
   /**
    * 异步处理登录操作
@@ -33,30 +35,30 @@ export const useAuthStore = defineStore('auth', () => {
     onSuccess?: () => Promise<void> | void,
   ) {
     // 异步处理用户登录操作并获取 accessToken
-    let userInfo: null | UserInfo = null;
+    let userInfo: null | UserInfo = null
     try {
-      loginLoading.value = true;
-      const { access_token } = await loginApi(params);
+      loginLoading.value = true
+      const { access_token } = await loginApi(params)
 
       // 将 accessToken 存储到 accessStore 中
-      accessStore.setAccessToken(access_token);
-      accessStore.setRefreshToken(access_token);
+      accessStore.setAccessToken(access_token)
+      accessStore.setRefreshToken(access_token)
 
       // 获取用户信息并存储到 accessStore 中
-      userInfo = await fetchUserInfo();
+      userInfo = await fetchUserInfo()
       /**
        * 设置用户信息
        */
-      userStore.setUserInfo(userInfo);
+      userStore.setUserInfo(userInfo)
       /**
        * 在这里设置权限
        */
-      accessStore.setAccessCodes(userInfo.permissions);
+      accessStore.setAccessCodes(userInfo.permissions)
 
       if (accessStore.loginExpired) {
-        accessStore.setLoginExpired(false);
+        accessStore.setLoginExpired(false)
       } else {
-        onSuccess ? await onSuccess?.() : await router.push('/analytics');
+        onSuccess ? await onSuccess?.() : await router.push('/analytics')
       }
 
       if (userInfo?.realName) {
@@ -64,48 +66,55 @@ export const useAuthStore = defineStore('auth', () => {
           description: `${$t('authentication.loginSuccessDesc')}:${userInfo?.realName}`,
           duration: 3,
           message: $t('authentication.loginSuccess'),
-        });
+        })
       }
     } finally {
-      loginLoading.value = false;
+      loginLoading.value = false
     }
 
     return {
       userInfo,
-    };
+    }
   }
 
   async function logout(redirect: boolean = true) {
     try {
-      await seeConnectionClose();
-      await doLogout();
+      await seeConnectionClose()
+      await doLogout()
+      /**
+       * 断开websocket连接
+       */
+      const ws = getWebSocketService();
+      if(ws) {
+        ws.close();
+      }
     } catch (error) {
-      console.error(error);
+      console.error(error)
     } finally {
-      resetAllStores();
-      accessStore.setLoginExpired(false);
+      resetAllStores()
+      accessStore.setLoginExpired(false)
 
       // 回登陆页带上当前路由地址
       await router.replace({
         path: LOGIN_PATH,
         query: redirect
           ? {
-              redirect: encodeURIComponent(router.currentRoute.value.fullPath),
-            }
+            redirect: encodeURIComponent(router.currentRoute.value.fullPath),
+          }
           : {},
-      });
+      })
     }
   }
 
   async function fetchUserInfo() {
-    const backUserInfo = await getUserInfoApi();
+    const backUserInfo = await getUserInfoApi()
     /**
      * 登录超时的情况
      */
     if (!backUserInfo) {
-      throw new Error('获取用户信息失败.');
+      throw new Error('获取用户信息失败.')
     }
-    const { permissions = [], roles = [], user } = backUserInfo;
+    const { permissions = [], roles = [], user } = backUserInfo
     /**
      * 从后台user -> vben user转换
      */
@@ -116,19 +125,25 @@ export const useAuthStore = defineStore('auth', () => {
       roles,
       userId: user.userId,
       username: user.userName,
-    };
-    userStore.setUserInfo(userInfo);
+    }
+    userStore.setUserInfo(userInfo)
+
+    /**
+     * 初始化websocket
+     */
+    initWebSocket()
+
     /**
      * 需要重新加载字典
      * 比如退出登录切换到其他租户
      */
-    const dictStore = useDictStore();
-    dictStore.resetCache();
-    return userInfo;
+    const dictStore = useDictStore()
+    dictStore.resetCache()
+    return userInfo
   }
 
   function $reset() {
-    loginLoading.value = false;
+    loginLoading.value = false
   }
 
   return {
@@ -137,5 +152,5 @@ export const useAuthStore = defineStore('auth', () => {
     fetchUserInfo,
     loginLoading,
     logout,
-  };
-});
+  }
+})

From e277e5d2c39f16a121a8f1b62858424235de0ca7 Mon Sep 17 00:00:00 2001
From: 15683799673 <liao@1234567>
Date: Tue, 2 Sep 2025 15:11:55 +0800
Subject: [PATCH 07/30] =?UTF-8?q?=E8=A7=86=E9=A2=91=E6=92=AD=E6=94=BE?=
 =?UTF-8?q?=E6=93=8D=E4=BD=9C=E9=80=BB=E8=BE=91=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 apps/web-antd/src/assets/tree/player-err.png  | Bin 0 -> 14471 bytes
 apps/web-antd/src/assets/tree/playering.png   | Bin 0 -> 14400 bytes
 apps/web-antd/src/assets/tree/unplayer.png    | Bin 0 -> 14416 bytes
 .../src/views/sis/video/channel-tree.vue      | 115 +++++++++++-------
 apps/web-antd/src/views/sis/video/index.vue   |  81 ++++++++++--
 5 files changed, 145 insertions(+), 51 deletions(-)
 create mode 100644 apps/web-antd/src/assets/tree/player-err.png
 create mode 100644 apps/web-antd/src/assets/tree/playering.png
 create mode 100644 apps/web-antd/src/assets/tree/unplayer.png

diff --git a/apps/web-antd/src/assets/tree/player-err.png b/apps/web-antd/src/assets/tree/player-err.png
new file mode 100644
index 0000000000000000000000000000000000000000..cb930672b73217eb44d765da77d2d0f00da6f6c0
GIT binary patch
literal 14471
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

literal 0
HcmV?d00001

diff --git a/apps/web-antd/src/assets/tree/playering.png b/apps/web-antd/src/assets/tree/playering.png
new file mode 100644
index 0000000000000000000000000000000000000000..46e9952d1c46d74fb1e5583a30fed45c57ee391e
GIT binary patch
literal 14400
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

literal 0
HcmV?d00001

diff --git a/apps/web-antd/src/assets/tree/unplayer.png b/apps/web-antd/src/assets/tree/unplayer.png
new file mode 100644
index 0000000000000000000000000000000000000000..a8d8d52b175be8a9eaa743b775239016e1b796e1
GIT binary patch
literal 14416
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

literal 0
HcmV?d00001

diff --git a/apps/web-antd/src/views/sis/video/channel-tree.vue b/apps/web-antd/src/views/sis/video/channel-tree.vue
index 6ae26b9e..47203245 100644
--- a/apps/web-antd/src/views/sis/video/channel-tree.vue
+++ b/apps/web-antd/src/views/sis/video/channel-tree.vue
@@ -7,17 +7,20 @@ import type { TreeNode } from '#/api/common';
 
 defineOptions({ inheritAttrs: false });
 
-withDefaults(defineProps<{ showSearch?: boolean }>(), { showSearch: true });
+withDefaults(
+  defineProps<{
+    showSearch?: boolean;
+    currentSelectKey?: string;
+    selectKeys?: string[];
+  }>(),
+  {
+    showSearch: true,
+    currentSelectKey: '',
+    selectKeys: [],
+  },
+);
 
-const emit = defineEmits<{
-
-  checked: [];
-  /**
-   * 点击节点的事件
-   */
-  reload: [];
-  select: [];
-}>();
+const emit = defineEmits(['selected', 'reload', 'checked']);
 
 const searchValue = defineModel('searchValue', {
   type: String,
@@ -37,6 +40,10 @@ async function loadChannelTree() {
   showTreeSkeleton.value = false;
 }
 
+function onSelect(key: any, selectNode: any) {
+  emit('selected', key, selectNode);
+}
+
 async function handleReload() {
   await loadChannelTree();
   emit('reload');
@@ -46,21 +53,11 @@ onMounted(loadChannelTree);
 </script>
 
 <template>
-  <div class="h-[800px]" :class="$attrs.class">
-    <Skeleton
-      :loading="showTreeSkeleton"
-      :paragraph="{ rows: 8 }"
-      active
-      class="p-[8px]"
-    >
-      <div
-        class="flex h-full flex-col overflow-y-auto rounded-lg"
-      >
+  <div :class="$attrs.class">
+    <Skeleton :loading="showTreeSkeleton" :paragraph="{ rows: 8 }" active>
+      <div class="h-full">
         <!-- 固定在顶部 必须加上bg-background背景色 否则会产生'穿透'效果 -->
-        <divx
-          v-if="showSearch"
-          class="z-100 sticky left-0 top-0 p-[8px]"
-        >
+        <div v-if="showSearch" class="z-100 sticky left-0 top-0 p-[8px]">
           <InputSearch
             v-model:value="searchValue"
             :placeholder="$t('pages.common.search')"
@@ -72,31 +69,45 @@ onMounted(loadChannelTree);
               </a-button>
             </template>
           </InputSearch>
-        </divx>
-        <div class="h-full overflow-x-hidden px-[8px]">
+        </div>
+
+        <div
+          class="h-[calc(100%-40px)] overflow-y-auto overflow-x-hidden px-[8px]"
+        >
           <Tree
             v-bind="$attrs"
             v-if="channelTree.length > 0"
-            :class="$attrs.class"
-            :show-line="{ showLeafIcon: false }"
             :tree-data="channelTree"
             :virtual="false"
             default-expand-all
-            checkable
-            @select="$emit('select')"
             @check="$emit('checked')"
+            @select="onSelect"
           >
-            <template #title="{ label }">
-              <span v-if="label.indexOf(searchValue) > -1">
-                {{ label.substring(0, label.indexOf(searchValue)) }}
-                <span style="color: #f50">{{ searchValue }}</span>
-                {{
-                  label.substring(
-                    label.indexOf(searchValue) + searchValue.length,
-                  )
-                }}
-              </span>
-              <span v-else>{{ label }}</span>
+            <template #title="{ label, level, key }">
+              <div class="flex">
+                <div v-if="level == 2" class="tree-icon">
+                  <div
+                    v-if="selectKeys.indexOf(key) > -1"
+                    class="icon playing"
+                  ></div>
+                  <div v-else class="icon unplay"></div>
+                </div>
+                <span :style="currentSelectKey == key?'color:blue':''">
+                  <span v-if="label.indexOf(searchValue) > -1">
+                  {{ label.substring(0, label.indexOf(searchValue)) }}
+                  <span style="color: #f50">{{ searchValue }}</span>
+                  {{
+                      label.substring(
+                        label.indexOf(searchValue) + searchValue.length,
+                      )
+                    }}
+                </span>
+
+                <span v-else>
+                  <span>{{ label }}</span>
+                </span>
+                </span>
+              </div>
             </template>
           </Tree>
         </div>
@@ -104,3 +115,25 @@ onMounted(loadChannelTree);
     </Skeleton>
   </div>
 </template>
+
+<style scoped>
+.tree-icon {
+  display: inline-block;
+  height: 20px;
+  width: 20px;
+
+  .unplay {
+    width: 100%;
+    height: 100%;
+    background: url('/src/assets/tree/unplayer.png') no-repeat;
+    background-size: 100% 100%;
+  }
+
+  .playing {
+    width: 100%;
+    height: 100%;
+    background: url('/src/assets/tree/playering.png') no-repeat;
+    background-size: 100% 100%;
+  }
+}
+</style>
diff --git a/apps/web-antd/src/views/sis/video/index.vue b/apps/web-antd/src/views/sis/video/index.vue
index 57206b85..71e99079 100644
--- a/apps/web-antd/src/views/sis/video/index.vue
+++ b/apps/web-antd/src/views/sis/video/index.vue
@@ -1,9 +1,15 @@
 <template>
-  <Page class="h-full w-full">
+  <Page style="height: calc(100vh - 88px)" class="video-page h-full w-full">
     <!--  设备分组区域  -->
     <div class="flex h-full gap-[8px]">
-      <div class="c-tree bg-background h-full pb-[5px]">
-        <ChannelTree class="w-[300px]" @check="onNodeChecked" />
+      <div class="c-tree bg-background h-full overflow-hidden pb-[5px]">
+        <ChannelTree
+          class="h-full w-[300px]"
+          :currentSelectKey="currentSelectKey"
+          :selectKeys="selectKeys"
+          @check="onNodeChecked"
+          @select="onTreeSelect"
+        />
       </div>
 
       <!--  设备分组区域  -->
@@ -79,14 +85,17 @@ const playerStyle = ref({
   width: '100%',
   height: '100%',
 });
-const currentSelectPlayerIndex = ref(-1);
+
+const currentSelectPlayerIndex = ref(1);
 
 function playerSelect(index: number) {
-  if (index === currentSelectPlayerIndex.value) {
-    currentSelectPlayerIndex.value = -1;
-    return;
-  }
   currentSelectPlayerIndex.value = index;
+  const player = playerList[index - 1];
+  if (player) {
+    currentSelectKey.value = player.key;
+  } else {
+    currentSelectKey.value = '';
+  }
 }
 
 /**
@@ -170,6 +179,48 @@ function handleParentNoe(node: any, newNode: any[] = []) {
 
 // 播放器数据, 每一个位置代表页面上行的一个矩形
 const playerList: any[] = [];
+// 当前选择播放器的key
+const currentSelectKey = ref('');
+// 当前所有的播放设备key
+const selectKeys = ref<string[]>([]);
+
+function onTreeSelect(_key: any, selectNode: any) {
+  const {
+    selected,
+    node: { level, data },
+  } = selectNode;
+  // 代表点击的是摄像头
+  if (level === 2) {
+    // 播放
+    if (selected) {
+      doPlayer(data, currentSelectPlayerIndex.value - 1);
+    }
+    // 取消播放
+    else {
+      for (let i = 0; i < playerNum.value; i++) {
+        const player = playerList[i];
+        if (player && player.data.id === data.id) {
+          closePlayer(i);
+        }
+      }
+    }
+  } else {
+    message.error('请选择摄像头');
+  }
+}
+
+function treeSelectHandle() {
+  // 此处player可能已经释放所以不可能在取到只
+  const player = playerList[currentSelectPlayerIndex.value - 1];
+  currentSelectKey.value = player ? player.key : '';
+  const arr: string[] = [];
+  playerList.forEach((item: any) => {
+    if (item && item.key) {
+      arr.push(item.key);
+    }
+  });
+  selectKeys.value = arr;
+}
 
 /**
  * 节点选中时间处理
@@ -302,13 +353,15 @@ function streamProxy(nodeData: any, cb: Function) {
  * 开始播放视频流
  * @param nodeData 播放的节点数据
  * @param index 播放器的索引信息
+ * @param callback 视频播放后的回调
  */
 function doPlayer(nodeData: any, index: number = 0) {
   console.log('index=', index);
   if (mpegts.isSupported()) {
     streamProxy(nodeData, (res: AddStreamProxyResult) => {
-      const host = window.location.host;
-      const url = `ws://${host}/${res.app}/${res.streamId}.live.flv`;
+      // const host = window.location.host;
+      // const url = `ws://${host}/${res.app}/${res.streamId}.live.flv`;
+      const url = `ws://183.230.235.66:11010/${res.app}/${res.streamId}.live.flv`;
       // 将url 绑定到 nodeData
       nodeData.url = url;
       closePlayer(index);
@@ -338,6 +391,8 @@ function doPlayer(nodeData: any, index: number = 0) {
           key: nodeData.id,
           data: nodeData,
         };
+        // 播放完成后， 需要处理树组件的状态
+        treeSelectHandle();
       } else {
         console.log('视频播放元素获取异常');
       }
@@ -353,6 +408,7 @@ function closePlayVieo(plInfo: any) {
       plInfo.pause(); // 暂停
       plInfo.unload(); // 卸载
       plInfo.destroy(); // 销毁
+      treeSelectHandle();
     } catch (e) {
       console.log('播放器关闭失败，e=', e);
     }
@@ -369,6 +425,7 @@ function closePlayer(index: number) {
       player.unload(); // 卸载
       player.destroy(); // 销毁
       playerList[index] = null;
+      treeSelectHandle();
     } catch (e) {
       console.log('播放器关闭失败，e=', e);
     }
@@ -415,6 +472,10 @@ onUnmounted(() => {
   }
 }
 
+.c-tree {
+  font-size: 12px;
+}
+
 .player.selected {
   border: 2px solid deepskyblue;
 }

From 6b1c4f01926962dce74152958dda9ad1b400b4fd Mon Sep 17 00:00:00 2001
From: 15683799673 <liao@1234567>
Date: Wed, 3 Sep 2025 01:13:57 +0800
Subject: [PATCH 08/30] =?UTF-8?q?=E8=A7=86=E9=A2=91=E6=92=AD=E6=94=BE?=
 =?UTF-8?q?=E6=93=8D=E4=BD=9C=E9=80=BB=E8=BE=91=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 apps/web-antd/src/views/sis/video/index.vue | 257 ++++++++++----------
 apps/web-antd/vite.config.mts               |   2 +-
 2 files changed, 133 insertions(+), 126 deletions(-)

diff --git a/apps/web-antd/src/views/sis/video/index.vue b/apps/web-antd/src/views/sis/video/index.vue
index 71e99079..b505ce56 100644
--- a/apps/web-antd/src/views/sis/video/index.vue
+++ b/apps/web-antd/src/views/sis/video/index.vue
@@ -19,29 +19,43 @@
             v-for="i in playerNum"
             :style="playerStyle"
             class="player"
-            :class="`layer-${i} ${currentSelectPlayerIndex == i ? selected : ''}`"
-            @click="playerSelect(i)"
+            :class="`layer-${i - 1} ${currentSelectPlayerIndex == i - 1 ? selected : ''}`"
+            @click="playerSelect(i - 1)"
           >
-            <video
-              style="width: 100%; height: 100%"
-              :ref="setItemRef"
-              muted
-              autoplay
-            ></video>
+            <Loading
+              :spinning="playerLoading[i - 1]"
+              text="加载中..."
+              class="flex h-full w-full items-center justify-center"
+            >
+              <video
+                style="width: 100%; height: 100%"
+                :ref="(el) => setItemRef(i - 1, el)"
+                muted
+                autoplay
+              ></video>
+            </Loading>
           </div>
         </div>
         <div class="player-area flex h-[30px] gap-[5px]">
-          <div @click="onPlayerNumChanged(1)" class="h-[20px] w-[20px]">
-            <Svg1FrameIcon style="width: 100%; height: 100%" />
-          </div>
-          <div @click="onPlayerNumChanged(2)" class="h-[20px] w-[20px]">
-            <Svg4FrameIcon style="width: 100%; height: 100%" />
-          </div>
-          <div @click="onPlayerNumChanged(3)" class="h-[20px] w-[20px]">
-            <Svg9FrameIcon style="width: 100%; height: 100%" />
-          </div>
-          <div @click="onPlayerNumChanged(4)" class="h-[20px] w-[20px]">
-            <Svg16FrameIcon style="width: 100%; height: 100%" />
+          <div
+            v-for="key in 4"
+            @click="onPlayerNumChanged(key)"
+            :class="playerSelectItemIndex == key ? selected : ''"
+            class="btn-item h-[20px] w-[20px]"
+          >
+            <Svg1FrameIcon v-if="key == 1" style="width: 100%; height: 100%" />
+            <Svg4FrameIcon
+              v-else-if="key == 2"
+              style="width: 100%; height: 100%"
+            />
+            <Svg9FrameIcon
+              v-else-if="key == 3"
+              style="width: 100%; height: 100%"
+            />
+            <Svg16FrameIcon
+              v-else-if="key == 4"
+              style="width: 100%; height: 100%"
+            />
           </div>
         </div>
       </div>
@@ -51,7 +65,7 @@
 
 <script lang="ts" setup>
 import { onMounted, onUnmounted, ref, toRaw } from 'vue';
-import { Page } from '@vben/common-ui';
+import { Loading, Page } from '@vben/common-ui';
 import ChannelTree from './channel-tree.vue';
 import mpegts from 'mpegts.js';
 import { message } from 'ant-design-vue';
@@ -67,30 +81,41 @@ import type { AddStreamProxyResult } from '#/api/sis/stream/model';
 
 const selected = 'selected';
 
-const itemRefs = ref<HTMLVideoElement[]>([]);
-const setItemRef = (el: any) => {
-  if (el) {
-    itemRefs.value.push(el);
-  }
+const itemRefs: any[] = [];
+const setItemRef = (index: number, el: any) => {
+  itemRefs[index] = el;
 };
 
-/**
- * 屏幕播放器数量
- */
-const playerNum = ref(1);
-/**
- * 屏幕播放器样式
- */
+//屏幕播放器样式
 const playerStyle = ref({
   width: '100%',
   height: '100%',
 });
+// 播放器配置
+const playerConfig = {
+  enableErrorRecover: true, // 启用错误恢复
+  autoCleanupMaxBackwardDuration: 30,
+  autoCleanupMinBackwardDuration: 10,
+};
+//屏幕播放器数量
+const playerNum = ref(1);
+// 播放器数量控制按钮组索引
+const playerSelectItemIndex = ref(1);
+// 当前选择的播放器索引,默认选中第一个
+const currentSelectPlayerIndex = ref(0);
+// 播放器数据, 每一个位置代表页面上行的一个矩形
+const playerList: any[] = [];
+// 播放器loading
+const playerLoading = ref<boolean[]>([]);
 
-const currentSelectPlayerIndex = ref(1);
+// 当前选择播放器的key
+const currentSelectKey = ref('');
+// 当前所有的播放设备key
+const selectKeys = ref<string[]>([]);
 
 function playerSelect(index: number) {
   currentSelectPlayerIndex.value = index;
-  const player = playerList[index - 1];
+  const player = playerList[index];
   if (player) {
     currentSelectKey.value = player.key;
   } else {
@@ -104,8 +129,8 @@ function playerSelect(index: number) {
  */
 function onPlayerNumChanged(val: number) {
   // 1个屏幕
-  const changeBeforeNum = playerNum.value;
   let changeNum = 1;
+  playerSelectItemIndex.value = val;
   if (val === 1) {
     playerStyle.value = {
       width: '100%',
@@ -137,26 +162,18 @@ function onPlayerNumChanged(val: number) {
     changeNum = 16;
   }
   playerNum.value = changeNum;
-  // 缩小布局
-  if (changeBeforeNum > changeNum) {
-    const playerArr = [];
-    for (let i = 0; i < playerList.length; i++) {
-      const playerBox = playerList[i];
-      if (playerBox) {
-        playerArr.push(playerBox);
-      }
-      playerList[i] = null;
-    }
-    for (let i = 0; i < playerArr.length; i++) {
-      const play = playerArr[i];
-      if (i < changeNum) {
-        // 获取播放元素
-        changeElPlayer(play, i);
-      } else {
-        closePlayVieo(play.player);
+  // 缩小布局,超过当前播放器的都关闭
+  for (let i = 0; i < playerList.length; i++) {
+    const playInfo = playerList[i];
+    if (i >= changeNum) {
+      if (playInfo) {
+        closePlayVieo(playInfo.player);
       }
     }
   }
+
+  // 处理树节点状态
+  treeSelectHandle();
 }
 
 /**
@@ -177,13 +194,6 @@ function handleParentNoe(node: any, newNode: any[] = []) {
   }
 }
 
-// 播放器数据, 每一个位置代表页面上行的一个矩形
-const playerList: any[] = [];
-// 当前选择播放器的key
-const currentSelectKey = ref('');
-// 当前所有的播放设备key
-const selectKeys = ref<string[]>([]);
-
 function onTreeSelect(_key: any, selectNode: any) {
   const {
     selected,
@@ -193,7 +203,7 @@ function onTreeSelect(_key: any, selectNode: any) {
   if (level === 2) {
     // 播放
     if (selected) {
-      doPlayer(data, currentSelectPlayerIndex.value - 1);
+      doPlayer(data, currentSelectPlayerIndex.value);
     }
     // 取消播放
     else {
@@ -211,7 +221,7 @@ function onTreeSelect(_key: any, selectNode: any) {
 
 function treeSelectHandle() {
   // 此处player可能已经释放所以不可能在取到只
-  const player = playerList[currentSelectPlayerIndex.value - 1];
+  const player = playerList[currentSelectPlayerIndex.value];
   currentSelectKey.value = player ? player.key : '';
   const arr: string[] = [];
   playerList.forEach((item: any) => {
@@ -245,7 +255,7 @@ function onNodeChecked(
      * 如果当前页面有选择播放未知，并且播放视频只有一个，则播放到制定位置
      */
     if (currentSelectPlayerIndex.value !== -1 && checkNode.length == 1) {
-      doPlayer(checkNode[0], currentSelectPlayerIndex.value - 1);
+      doPlayer(checkNode[0], currentSelectPlayerIndex.value);
     }
     // 批量播放 currentSelectPlayerIndex 将不再生效
     else {
@@ -284,40 +294,33 @@ function onNodeChecked(
   }
 }
 
-function changeElPlayer(playerInfo: any, index: number) {
-  const playerData = playerInfo.data;
-  const oldPlayer = playerInfo.player;
-  if (oldPlayer) {
-    closePlayVieo(oldPlayer);
-  }
-  const videoConfig = {
-    type: 'flv',
-    url: playerData.url,
-    isLive: true,
-    hasAudio: false,
-    hasVideo: true,
-    enableWorker: true, // 启用分离的线程进行转码
-    enableStashBuffer: false, // 关闭IO隐藏缓冲区
-    stashInitialSize: 256, // 减少首帧显示等待时长
-  };
-  const playerConfig = {
-    enableErrorRecover: true, // 启用错误恢复
-    autoCleanupMaxBackwardDuration: 30,
-    autoCleanupMinBackwardDuration: 10,
-  };
-  const player = mpegts.createPlayer(videoConfig, playerConfig);
-  const videoElement = itemRefs.value[index];
-  if (videoElement) {
-    player.attachMediaElement(videoElement);
-    player.load();
-    player.play();
-    playerList[index] = {
-      player,
-      data: playerData,
-    };
-  } else {
-    console.log('视频播放元素获取异常');
-  }
+/**
+ * 添加媒体播放器事件监听
+ * @param index 媒体索引
+ * @param player 播放器对象
+ */
+function addPlayerListener(index: number, player: any) {
+  // 播放结束。
+  player.on(mpegts.Events.LOADING_COMPLETE, (...args: any[]) => {
+    console.log('LOADING_COMPLETE', args);
+  });
+  // 播放媒体数据
+  player.on(mpegts.Events.MEDIA_INFO, (...args: any[]) => {
+    console.log('MEDIA_INFO', args);
+    loading(index, 1);
+  });
+  // 播放媒体元数据到到达
+  player.on(mpegts.Events.METADATA_ARRIVED, (...args: any[]) => {
+    console.log('METADATA_ARRIVED', args);
+  });
+  // 统计播放数据
+  // player.on(mpegts.Events.STATISTICS_INFO, (...args: any[]) => {
+  // console.log('STATISTICS_INFO', args);
+  // });
+  // 播放异常
+  player.on(mpegts.Events.ERROR, (...args: any[]) => {
+    console.log('ERROR', args);
+  });
 }
 
 function streamProxy(nodeData: any, cb: Function) {
@@ -353,7 +356,6 @@ function streamProxy(nodeData: any, cb: Function) {
  * 开始播放视频流
  * @param nodeData 播放的节点数据
  * @param index 播放器的索引信息
- * @param callback 视频播放后的回调
  */
 function doPlayer(nodeData: any, index: number = 0) {
   console.log('index=', index);
@@ -375,13 +377,11 @@ function doPlayer(nodeData: any, index: number = 0) {
         enableStashBuffer: false, // 关闭IO隐藏缓冲区
         stashInitialSize: 256, // 减少首帧显示等待时长
       };
-      const playerConfig = {
-        enableErrorRecover: true, // 启用错误恢复
-        autoCleanupMaxBackwardDuration: 30,
-        autoCleanupMinBackwardDuration: 10,
-      };
+      // 开启loading
+      loading(index);
       const player = mpegts.createPlayer(videoConfig, playerConfig);
-      const videoElement = itemRefs.value[index];
+      addPlayerListener(index, player);
+      const videoElement = itemRefs[index];
       if (videoElement) {
         player.attachMediaElement(videoElement);
         player.load();
@@ -407,6 +407,7 @@ function closePlayVieo(plInfo: any) {
     try {
       plInfo.pause(); // 暂停
       plInfo.unload(); // 卸载
+      plInfo.detachMediaElement();
       plInfo.destroy(); // 销毁
       treeSelectHandle();
     } catch (e) {
@@ -419,31 +420,19 @@ function closePlayer(index: number) {
   // 如果播放器存在，尝试关闭
   const pData = playerList[index];
   if (pData) {
-    try {
-      const player = pData.player;
-      player.pause(); // 暂停
-      player.unload(); // 卸载
-      player.destroy(); // 销毁
-      playerList[index] = null;
-      treeSelectHandle();
-    } catch (e) {
-      console.log('播放器关闭失败，e=', e);
-    }
+    closePlayVieo(pData.player);
   }
 }
 
-function catchUp() {
-  playerList.forEach((playerData) => {
-    if (playerData) {
-      const { player, el } = playerData;
-      const end = player.buffered.end(player.buffered.length - 1);
-      const diff = end - el.currentTime;
-      if (diff > 2) {
-        // 如果延迟超过2秒
-        el.currentTime = end - 0.5; // 跳转到接近直播点
-      }
-    }
-  });
+/**
+ * 开启或关闭播放器loading
+ * @param index 播放器索引
+ * @param cmd 0:开启，1:关闭
+ */
+function loading(index: number, cmd: Number = 0) {
+  const loadinArr = [...playerLoading.value];
+  loadinArr[index] = cmd === 0;
+  playerLoading.value = loadinArr;
 }
 
 let isSupportH265 = false;
@@ -458,6 +447,20 @@ onUnmounted(() => {
     closePlayer(i);
   }
 });
+
+function catchUp() {
+  playerList.forEach((playerData) => {
+    if (playerData) {
+      const { player, el } = playerData;
+      const end = player.buffered.end(player.buffered.length - 1);
+      const diff = end - el.currentTime;
+      if (diff > 2) {
+        // 如果延迟超过2秒
+        el.currentTime = end - 0.5; // 跳转到接近直播点
+      }
+    }
+  });
+}
 </script>
 
 <style scoped>
@@ -484,5 +487,9 @@ onUnmounted(() => {
   display: flex;
   align-items: center;
   cursor: pointer;
+
+  .btn-item.selected {
+    color: #00a8ff;
+  }
 }
 </style>
diff --git a/apps/web-antd/vite.config.mts b/apps/web-antd/vite.config.mts
index 7e884500..fcce105a 100644
--- a/apps/web-antd/vite.config.mts
+++ b/apps/web-antd/vite.config.mts
@@ -27,7 +27,7 @@ export default defineConfig(async () => {
             changeOrigin: true,
             rewrite: (path) => path.replace(/^\/api/, ''),
             // mock代理目标地址
-            target: 'http://localhost:8080',
+            target: 'http://183.230.235.66:11010/api/',
             ws: true,
           },
         },

From 8661888c8e2ffa493a624314c8a029cb152a908e Mon Sep 17 00:00:00 2001
From: 15683799673 <liao@1234567>
Date: Wed, 3 Sep 2025 01:15:56 +0800
Subject: [PATCH 09/30] =?UTF-8?q?=E8=A7=86=E9=A2=91=E6=92=AD=E6=94=BE?=
 =?UTF-8?q?=E6=93=8D=E4=BD=9C=E9=80=BB=E8=BE=91=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 apps/web-antd/src/views/sis/video/index.vue | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/apps/web-antd/src/views/sis/video/index.vue b/apps/web-antd/src/views/sis/video/index.vue
index b505ce56..82f64f8b 100644
--- a/apps/web-antd/src/views/sis/video/index.vue
+++ b/apps/web-antd/src/views/sis/video/index.vue
@@ -361,9 +361,9 @@ function doPlayer(nodeData: any, index: number = 0) {
   console.log('index=', index);
   if (mpegts.isSupported()) {
     streamProxy(nodeData, (res: AddStreamProxyResult) => {
-      // const host = window.location.host;
-      // const url = `ws://${host}/${res.app}/${res.streamId}.live.flv`;
-      const url = `ws://183.230.235.66:11010/${res.app}/${res.streamId}.live.flv`;
+      const host = window.location.host;
+      const url = `ws://${host}/${res.app}/${res.streamId}.live.flv`;
+      // const url = `ws://183.230.235.66:11010/${res.app}/${res.streamId}.live.flv`;
       // 将url 绑定到 nodeData
       nodeData.url = url;
       closePlayer(index);

From e82d2e7a3eebee5b915490e753ef97275525b3ec Mon Sep 17 00:00:00 2001
From: dev_ljl <2590379346@qq.com>
Date: Wed, 3 Sep 2025 12:10:44 +0800
Subject: [PATCH 10/30] =?UTF-8?q?feat:=E8=A7=86=E9=A2=91=E9=A2=84=E8=AD=A6?=
 =?UTF-8?q?=E5=BE=85=E5=8A=9E=E3=80=81=E5=B7=B2=E5=8A=9E=E8=AF=A6=E6=83=85?=
 =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E5=A4=84=E7=90=86=E4=BA=BA=E4=BF=A1=E6=81=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../videoWarningHasDone/warning-detail.vue    | 49 ++++++++++++-------
 .../videoWarningToDone/warning-detail.vue     | 34 +++++++++----
 2 files changed, 54 insertions(+), 29 deletions(-)

diff --git a/apps/web-antd/src/views/videoSystem/videoWarning/videoWarningHasDone/warning-detail.vue b/apps/web-antd/src/views/videoSystem/videoWarning/videoWarningHasDone/warning-detail.vue
index dd9e1bdb..755d9fcc 100644
--- a/apps/web-antd/src/views/videoSystem/videoWarning/videoWarningHasDone/warning-detail.vue
+++ b/apps/web-antd/src/views/videoSystem/videoWarning/videoWarningHasDone/warning-detail.vue
@@ -1,7 +1,7 @@
 <script setup lang="ts">
 import { ref, shallowRef } from 'vue';
 import { useVbenModal } from '@vben/common-ui';
-import { Descriptions, DescriptionsItem, Image, Tag } from 'ant-design-vue';
+import { Descriptions, DescriptionsItem, Image, Tag,Divider } from 'ant-design-vue';
 import { queryAlarmEventAttachmentsList } from '#/api/sis/alarmEventAttachments';
 import type { AlarmEventAttachmentsVO } from '#/api/sis/alarmEventAttachments/model';
 import { fallImg } from './data';
@@ -110,25 +110,10 @@ function loadProcessList() {
         {{ warningDetail.description }}
       </DescriptionsItem>
 
-      <DescriptionsItem label="所在位置">
+      <DescriptionsItem label="所在位置" :span="2">
         {{ warningDetail.deviceName }}
       </DescriptionsItem>
-
-      <DescriptionsItem label="处理状态">
-        <Tag>
-          {{ warningDetail.stateName }}
-        </Tag>
-      </DescriptionsItem>
-
-      <DescriptionsItem label="处理情况" :span="2">
-        {{ warningDetail.processingDetails || '-' }}
-      </DescriptionsItem>
-
-      <DescriptionsItem label="处理时间" :span="2">
-        {{ warningDetail.solveTime || '-' }}
-      </DescriptionsItem>
-
-      <DescriptionsItem :span="1" label="附件信息">
+      <DescriptionsItem :span="2" label="附件信息">
         <div class="file-box">
           <div class="img-box" v-for="item in currFiles">
             <Image
@@ -140,7 +125,33 @@ function loadProcessList() {
         </div>
       </DescriptionsItem>
 
-      <DescriptionsItem :span="1" label="报警视频"></DescriptionsItem>
+      <DescriptionsItem :span="2" label="报警视频"></DescriptionsItem>
+    </Descriptions>
+    <Divider orientation="left">处理</Divider>
+    <Descriptions
+      v-if="warningDetail"
+      size="small"
+      :column="2"
+      bordered
+      :labelStyle="{ width: '120px' }"
+      style="margin-bottom: 30px">
+      <DescriptionsItem label="处理状态">
+        <Tag>
+          {{ warningDetail.stateName }}
+        </Tag>
+      </DescriptionsItem>
+      <DescriptionsItem label="处理人">
+        {{ warningDetail.solveName }}
+      </DescriptionsItem>
+      <DescriptionsItem label="处理人电话">
+        {{ warningDetail.solvePhone }}
+      </DescriptionsItem>
+      <DescriptionsItem label="处理时间">
+        {{ warningDetail.solveTime || '-' }}
+      </DescriptionsItem>
+      <DescriptionsItem label="处理情况" :span="2">
+        {{ warningDetail.processingDetails || '-' }}
+      </DescriptionsItem>
     </Descriptions>
   </BasicModal>
 </template>
diff --git a/apps/web-antd/src/views/videoSystem/videoWarning/videoWarningToDone/warning-detail.vue b/apps/web-antd/src/views/videoSystem/videoWarning/videoWarningToDone/warning-detail.vue
index cc1c4112..dc0fa3eb 100644
--- a/apps/web-antd/src/views/videoSystem/videoWarning/videoWarningToDone/warning-detail.vue
+++ b/apps/web-antd/src/views/videoSystem/videoWarning/videoWarningToDone/warning-detail.vue
@@ -1,7 +1,7 @@
 <script setup lang="ts">
 import { ref, shallowRef } from 'vue';
 import { useVbenModal } from '@vben/common-ui';
-import { Descriptions, DescriptionsItem, Image, Tag } from 'ant-design-vue';
+import {Descriptions, DescriptionsItem, Divider, Image, Tag} from 'ant-design-vue';
 import { queryAlarmEventAttachmentsList } from '#/api/sis/alarmEventAttachments';
 import type { AlarmEventAttachmentsVO } from '#/api/sis/alarmEventAttachments/model';
 import { fallImg } from './data';
@@ -108,17 +108,11 @@ function loadProcessList() {
         {{ warningDetail.description }}
       </DescriptionsItem>
 
-      <DescriptionsItem label="所在位置">
+      <DescriptionsItem label="所在位置" :span="2">
         {{ warningDetail.deviceName }}
       </DescriptionsItem>
 
-      <DescriptionsItem label="处理状态">
-        <Tag color="success">
-          {{ warningDetail.stateName }}
-        </Tag>
-      </DescriptionsItem>
-
-      <DescriptionsItem :span="1" label="附件信息">
+      <DescriptionsItem label="附件信息"  :span="2">
         <div class="file-box">
           <div class="img-box" v-for="item in currFiles">
             <Image
@@ -130,7 +124,27 @@ function loadProcessList() {
         </div>
       </DescriptionsItem>
 
-      <DescriptionsItem :span="1" label="报警视频"></DescriptionsItem>
+      <DescriptionsItem :span="2" label="报警视频"></DescriptionsItem>
+    </Descriptions>
+    <Divider orientation="left">处理</Divider>
+    <Descriptions
+      v-if="warningDetail"
+      size="small"
+      :column="2"
+      bordered
+      :labelStyle="{ width: '120px' }"
+      style="margin-bottom: 30px">
+      <DescriptionsItem label="处理状态" :span="2">
+        <Tag>
+          {{ warningDetail.stateName }}
+        </Tag>
+      </DescriptionsItem>
+      <DescriptionsItem label="处理人">
+        {{ warningDetail.solveName }}
+      </DescriptionsItem>
+      <DescriptionsItem label="处理人电话">
+        {{ warningDetail.solvePhone }}
+      </DescriptionsItem>
     </Descriptions>
   </BasicModal>
 </template>

From 27cf960ce17de1ac1152a39ba0e51c8054c3db3c Mon Sep 17 00:00:00 2001
From: zcxlsm <patrickstarlsm@163.com>
Date: Wed, 3 Sep 2025 15:14:01 +0800
Subject: [PATCH 11/30] =?UTF-8?q?fix(property):=20-=20=E6=B7=BB=E5=8A=A0?=
 =?UTF-8?q?=20websocket=20=E8=BF=9E=E6=8E=A5=E7=8A=B6=E6=80=81=E6=A3=80?=
 =?UTF-8?q?=E6=9F=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../electricEnergy/elctricitySituation/index.vue      | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/apps/web-antd/src/views/property/energyManagement/electricEnergy/elctricitySituation/index.vue b/apps/web-antd/src/views/property/energyManagement/electricEnergy/elctricitySituation/index.vue
index 4b6b1c7d..e5642255 100644
--- a/apps/web-antd/src/views/property/energyManagement/electricEnergy/elctricitySituation/index.vue
+++ b/apps/web-antd/src/views/property/energyManagement/electricEnergy/elctricitySituation/index.vue
@@ -8,6 +8,9 @@ import { getWebSocketService } from '#/api/websocket';
 import { currentReading } from '#/api/property/energyManagement/meterInfo';
 
 const ws = getWebSocketService();
+const readingData = ref<any>({});
+const readingTime = ref('');
+let readingLoading = ref(false);
 
 if (ws) {
   // 使用setOnMessageCallback方法设置消息回调
@@ -34,15 +37,15 @@ if (ws) {
     currentReading({ meterType: 0, floorId: 0 });
     readingLoading.value = false;
   });
+}else {
+  readingLoading.value = false;
+  message.warn('websocket未连接！请刷新页面重试！');
 }
 
 onBeforeUnmount(() => {
+  // 关闭页面，发送请求停止心跳
   currentReading({ meterType: 0, floorId: 0 });
 });
-
-const readingData = ref<any>({});
-const readingTime = ref('');
-let readingLoading = ref(false);
 async function handleSelectFloor(selectedKeys, info) {
   if (typeof selectedKeys[0] === 'undefined') {
     return;

From 2de44541fa8181765f205382fa6e96d31519ebf0 Mon Sep 17 00:00:00 2001
From: dev_ljl <2590379346@qq.com>
Date: Thu, 4 Sep 2025 09:29:53 +0800
Subject: [PATCH 12/30] =?UTF-8?q?feat:=E4=BC=9A=E8=AE=AE=E5=8F=82=E4=BC=9A?=
 =?UTF-8?q?=E4=BA=BA=E5=91=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../roomBooking/participants/index.ts         |  61 ++++++
 .../roomBooking/participants/model.d.ts       |  54 ++++++
 .../property/roomBooking/participants/data.ts |  65 +++++++
 .../roomBooking/participants/index.vue        | 178 ++++++++++++++++++
 .../participants/participants-modal.vue       | 101 ++++++++++
 5 files changed, 459 insertions(+)
 create mode 100644 apps/web-antd/src/api/property/roomBooking/participants/index.ts
 create mode 100644 apps/web-antd/src/api/property/roomBooking/participants/model.d.ts
 create mode 100644 apps/web-antd/src/views/property/roomBooking/participants/data.ts
 create mode 100644 apps/web-antd/src/views/property/roomBooking/participants/index.vue
 create mode 100644 apps/web-antd/src/views/property/roomBooking/participants/participants-modal.vue

diff --git a/apps/web-antd/src/api/property/roomBooking/participants/index.ts b/apps/web-antd/src/api/property/roomBooking/participants/index.ts
new file mode 100644
index 00000000..e69e5d19
--- /dev/null
+++ b/apps/web-antd/src/api/property/roomBooking/participants/index.ts
@@ -0,0 +1,61 @@
+import type { ParticipantsVO, ParticipantsForm, ParticipantsQuery } from './model';
+
+import type { ID, IDS } from '#/api/common';
+import type { PageResult } from '#/api/common';
+
+import { commonExport } from '#/api/helper';
+import { requestClient } from '#/api/request';
+
+/**
+* 查询会议室参会记录列表
+* @param params
+* @returns 会议室参会记录列表
+*/
+export function participantsList(params?: ParticipantsQuery) {
+  return requestClient.get<PageResult<ParticipantsVO>>('/property/participants/list', { params });
+}
+
+/**
+ * 导出会议室参会记录列表
+ * @param params
+ * @returns 会议室参会记录列表
+ */
+export function participantsExport(params?: ParticipantsQuery) {
+  return commonExport('/property/participants/export', params ?? {});
+}
+
+/**
+ * 查询会议室参会记录详情
+ * @param id id
+ * @returns 会议室参会记录详情
+ */
+export function participantsInfo(id: ID) {
+  return requestClient.get<ParticipantsVO>(`/property/participants/${id}`);
+}
+
+/**
+ * 新增会议室参会记录
+ * @param data
+ * @returns void
+ */
+export function participantsAdd(data: ParticipantsForm) {
+  return requestClient.postWithMsg<void>('/property/participants', data);
+}
+
+/**
+ * 更新会议室参会记录
+ * @param data
+ * @returns void
+ */
+export function participantsUpdate(data: ParticipantsForm) {
+  return requestClient.putWithMsg<void>('/property/participants', data);
+}
+
+/**
+ * 删除会议室参会记录
+ * @param id id
+ * @returns void
+ */
+export function participantsRemove(id: ID | IDS) {
+  return requestClient.deleteWithMsg<void>(`/property/participants/${id}`);
+}
diff --git a/apps/web-antd/src/api/property/roomBooking/participants/model.d.ts b/apps/web-antd/src/api/property/roomBooking/participants/model.d.ts
new file mode 100644
index 00000000..15bb4773
--- /dev/null
+++ b/apps/web-antd/src/api/property/roomBooking/participants/model.d.ts
@@ -0,0 +1,54 @@
+import type { PageQuery, BaseEntity } from '#/api/common';
+
+export interface ParticipantsVO {
+  /**
+   * 主键id
+   */
+  id: string | number;
+
+  /**
+   * 会议室id
+   */
+  meetId: string | number;
+
+  /**
+   * 入驻人员id
+   */
+  residentPersonId: string | number;
+
+}
+
+export interface ParticipantsForm extends BaseEntity {
+  /**
+   * 主键id
+   */
+  id?: string | number;
+
+  /**
+   * 会议室id
+   */
+  meetId?: string | number;
+
+  /**
+   * 入驻人员id
+   */
+  residentPersonId?: string | number;
+
+}
+
+export interface ParticipantsQuery extends PageQuery {
+  /**
+   * 会议室id
+   */
+  meetId?: string | number;
+
+  /**
+   * 入驻人员id
+   */
+  residentPersonId?: string | number;
+
+  /**
+    * 日期范围参数
+    */
+  params?: any;
+}
diff --git a/apps/web-antd/src/views/property/roomBooking/participants/data.ts b/apps/web-antd/src/views/property/roomBooking/participants/data.ts
new file mode 100644
index 00000000..4400d58b
--- /dev/null
+++ b/apps/web-antd/src/views/property/roomBooking/participants/data.ts
@@ -0,0 +1,65 @@
+import type { FormSchemaGetter } from '#/adapter/form';
+import type { VxeGridProps } from '#/adapter/vxe-table';
+
+
+export const querySchema: FormSchemaGetter = () => [
+  {
+    component: 'Input',
+    fieldName: 'meetId',
+    label: '会议室id',
+  },
+  {
+    component: 'Input',
+    fieldName: 'residentPersonId',
+    label: '入驻人员id',
+  },
+];
+
+// 需要使用i18n注意这里要改成getter形式 否则切换语言不会刷新
+// export const columns: () => VxeGridProps['columns'] = () => [
+export const columns: VxeGridProps['columns'] = [
+  { type: 'checkbox', width: 60 },
+  {
+    title: '主键id',
+    field: 'id',
+  },
+  {
+    title: '会议室id',
+    field: 'meetId',
+  },
+  {
+    title: '入驻人员id',
+    field: 'residentPersonId',
+  },
+  {
+    field: 'action',
+    fixed: 'right',
+    slots: { default: 'action' },
+    title: '操作',
+    width: 180,
+  },
+];
+
+export const modalSchema: FormSchemaGetter = () => [
+  {
+    label: '主键id',
+    fieldName: 'id',
+    component: 'Input',
+    dependencies: {
+      show: () => false,
+      triggerFields: [''],
+    },
+  },
+  {
+    label: '会议室id',
+    fieldName: 'meetId',
+    component: 'Input',
+    rules: 'required',
+  },
+  {
+    label: '入驻人员id',
+    fieldName: 'residentPersonId',
+    component: 'Input',
+    rules: 'required',
+  },
+];
diff --git a/apps/web-antd/src/views/property/roomBooking/participants/index.vue b/apps/web-antd/src/views/property/roomBooking/participants/index.vue
new file mode 100644
index 00000000..2fbd3def
--- /dev/null
+++ b/apps/web-antd/src/views/property/roomBooking/participants/index.vue
@@ -0,0 +1,178 @@
+<script setup lang="ts">
+
+import { Page, useVbenModal, type VbenFormProps } from '@vben/common-ui';
+import { getVxePopupContainer } from '@vben/utils';
+
+import { Modal, Popconfirm, Space } from 'ant-design-vue';
+
+import {
+  useVbenVxeGrid,
+  vxeCheckboxChecked,
+  type VxeGridProps
+} from '#/adapter/vxe-table';
+
+import {
+  participantsExport,
+  participantsList,
+  participantsRemove,
+} from '#/api/property/roomBooking/participants';
+import type { ParticipantsForm } from '#/api/property/roomBooking/participants/model';
+import { commonDownloadExcel } from '#/utils/file/download';
+
+import participantsModal from './participants-modal.vue';
+import { columns, querySchema } from './data';
+
+const formOptions: VbenFormProps = {
+  commonConfig: {
+    labelWidth: 80,
+    componentProps: {
+      allowClear: true,
+    },
+  },
+  schema: querySchema(),
+  wrapperClass: 'grid-cols-1 md:grid-cols-2 lg:grid-cols-3 xl:grid-cols-4',
+  // 处理区间选择器RangePicker时间格式 将一个字段映射为两个字段 搜索/导出会用到
+  // 不需要直接删除
+  // fieldMappingTime: [
+  //  [
+  //    'createTime',
+  //    ['params[beginTime]', 'params[endTime]'],
+  //    ['YYYY-MM-DD 00:00:00', 'YYYY-MM-DD 23:59:59'],
+  //  ],
+  // ],
+};
+
+const gridOptions: VxeGridProps = {
+  checkboxConfig: {
+    // 高亮
+    highlight: true,
+    // 翻页时保留选中状态
+    reserve: true,
+    // 点击行选中
+    // trigger: 'row',
+  },
+  // 需要使用i18n注意这里要改成getter形式 否则切换语言不会刷新
+  // columns: columns(),
+  columns,
+  height: 'auto',
+  keepSource: true,
+  pagerConfig: {},
+  proxyConfig: {
+    ajax: {
+      query: async ({ page }, formValues = {}) => {
+        return await participantsList({
+          pageNum: page.currentPage,
+          pageSize: page.pageSize,
+          ...formValues,
+        });
+      },
+    },
+  },
+  rowConfig: {
+    keyField: 'id',
+  },
+  // 表格全局唯一表示 保存列配置需要用到
+  id: 'property-participants-index'
+};
+
+const [BasicTable, tableApi] = useVbenVxeGrid({
+  formOptions,
+  gridOptions,
+});
+
+const [ParticipantsModal, modalApi] = useVbenModal({
+  connectedComponent: participantsModal,
+});
+
+function handleAdd() {
+  modalApi.setData({});
+  modalApi.open();
+}
+
+async function handleEdit(row: Required<ParticipantsForm>) {
+  modalApi.setData({ id: row.id });
+  modalApi.open();
+}
+
+async function handleDelete(row: Required<ParticipantsForm>) {
+  await participantsRemove(row.id);
+  await tableApi.query();
+}
+
+function handleMultiDelete() {
+  const rows = tableApi.grid.getCheckboxRecords();
+  const ids = rows.map((row: Required<ParticipantsForm>) => row.id);
+  Modal.confirm({
+    title: '提示',
+    okType: 'danger',
+    content: `确认删除选中的${ids.length}条记录吗？`,
+    onOk: async () => {
+      await participantsRemove(ids);
+      await tableApi.query();
+    },
+  });
+}
+
+function handleDownloadExcel() {
+  commonDownloadExcel(participantsExport, '会议室参会记录数据', tableApi.formApi.form.values, {
+    fieldMappingTime: formOptions.fieldMappingTime,
+  });
+}
+</script>
+
+<template>
+  <Page :auto-content-height="true">
+    <BasicTable table-title="会议室参会记录列表">
+      <template #toolbar-tools>
+        <Space>
+          <a-button
+            v-access:code="['property:participants:export']"
+            @click="handleDownloadExcel"
+          >
+            {{ $t('pages.common.export') }}
+          </a-button>
+          <a-button
+            :disabled="!vxeCheckboxChecked(tableApi)"
+            danger
+            type="primary"
+            v-access:code="['property:participants:remove']"
+            @click="handleMultiDelete">
+            {{ $t('pages.common.delete') }}
+          </a-button>
+          <a-button
+            type="primary"
+            v-access:code="['property:participants:add']"
+            @click="handleAdd"
+          >
+            {{ $t('pages.common.add') }}
+          </a-button>
+        </Space>
+      </template>
+      <template #action="{ row }">
+        <Space>
+          <ghost-button
+            v-access:code="['property:participants:edit']"
+            @click.stop="handleEdit(row)"
+          >
+            {{ $t('pages.common.edit') }}
+          </ghost-button>
+          <Popconfirm
+            :get-popup-container="getVxePopupContainer"
+            placement="left"
+            title="确认删除？"
+            @confirm="handleDelete(row)"
+          >
+            <ghost-button
+              danger
+              v-access:code="['property:participants:remove']"
+              @click.stop=""
+            >
+              {{ $t('pages.common.delete') }}
+            </ghost-button>
+          </Popconfirm>
+        </Space>
+      </template>
+    </BasicTable>
+    <ParticipantsModal @reload="tableApi.query()" />
+  </Page>
+</template>
diff --git a/apps/web-antd/src/views/property/roomBooking/participants/participants-modal.vue b/apps/web-antd/src/views/property/roomBooking/participants/participants-modal.vue
new file mode 100644
index 00000000..4972eaa2
--- /dev/null
+++ b/apps/web-antd/src/views/property/roomBooking/participants/participants-modal.vue
@@ -0,0 +1,101 @@
+<script setup lang="ts">
+import { computed, ref } from 'vue';
+
+import { useVbenModal } from '@vben/common-ui';
+import { $t } from '@vben/locales';
+import { cloneDeep } from '@vben/utils';
+
+import { useVbenForm } from '#/adapter/form';
+import { participantsAdd, participantsInfo, participantsUpdate } from '#/api/property/roomBooking/participants';
+import { defaultFormValueGetter, useBeforeCloseDiff } from '#/utils/popup';
+
+import { modalSchema } from './data';
+
+const emit = defineEmits<{ reload: [] }>();
+
+const isUpdate = ref(false);
+const title = computed(() => {
+  return isUpdate.value ? $t('pages.common.edit') : $t('pages.common.add');
+});
+
+const [BasicForm, formApi] = useVbenForm({
+  commonConfig: {
+    // 默认占满两列
+    formItemClass: 'col-span-2',
+    // 默认label宽度 px
+    labelWidth: 80,
+    // 通用配置项 会影响到所有表单项
+    componentProps: {
+      class: 'w-full',
+    }
+  },
+  schema: modalSchema(),
+  showDefaultActions: false,
+  wrapperClass: 'grid-cols-2',
+});
+
+const { onBeforeClose, markInitialized, resetInitialized } = useBeforeCloseDiff(
+  {
+    initializedGetter: defaultFormValueGetter(formApi),
+    currentGetter: defaultFormValueGetter(formApi),
+  },
+);
+
+const [BasicModal, modalApi] = useVbenModal({
+  // 在这里更改宽度
+  class: 'w-[550px]',
+  fullscreenButton: false,
+  onBeforeClose,
+  onClosed: handleClosed,
+  onConfirm: handleConfirm,
+  onOpenChange: async (isOpen) => {
+    if (!isOpen) {
+      return null;
+    }
+    modalApi.modalLoading(true);
+
+    const { id } = modalApi.getData() as { id?: number | string };
+    isUpdate.value = !!id;
+
+    if (isUpdate.value && id) {
+      const record = await participantsInfo(id);
+      await formApi.setValues(record);
+    }
+    await markInitialized();
+
+    modalApi.modalLoading(false);
+  },
+});
+
+async function handleConfirm() {
+  try {
+    modalApi.lock(true);
+    const { valid } = await formApi.validate();
+    if (!valid) {
+      return;
+    }
+    // getValues获取为一个readonly的对象 需要修改必须先深拷贝一次
+    const data = cloneDeep(await formApi.getValues());
+    await (isUpdate.value ? participantsUpdate(data) : participantsAdd(data));
+    resetInitialized();
+    emit('reload');
+    modalApi.close();
+  } catch (error) {
+    console.error(error);
+  } finally {
+    modalApi.lock(false);
+  }
+}
+
+async function handleClosed() {
+  await formApi.resetForm();
+  resetInitialized();
+}
+</script>
+
+<template>
+  <BasicModal :title="title">
+    <BasicForm />
+  </BasicModal>
+</template>
+

From b0d48d0425467f70552dcbb36c980938f9eaf6b4 Mon Sep 17 00:00:00 2001
From: FLL <2162874245@qq.com>
Date: Thu, 4 Sep 2025 16:12:11 +0800
Subject: [PATCH 13/30] =?UTF-8?q?=E7=BC=B4=E8=B4=B9=E5=AE=A1=E6=A0=B8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../roomBooking/participants/index.ts         |   2 -
 .../inspectionPoint/data.ts                   |   6 +
 .../src/views/property/room/floor-tree.vue    | 122 +++++++++++++++++
 .../src/views/property/room/index.vue         | 126 +++++++++---------
 .../property/roomBooking/participants/data.ts | 101 ++++++++------
 .../roomBooking/participants/index.vue        |  97 ++------------
 .../participants/participants-detail.vue      |  82 ++++++++++++
 .../participants/participants-modal.vue       | 101 --------------
 apps/web-antd/vite.config.mts                 |   2 +-
 9 files changed, 347 insertions(+), 292 deletions(-)
 create mode 100644 apps/web-antd/src/views/property/room/floor-tree.vue
 create mode 100644 apps/web-antd/src/views/property/roomBooking/participants/participants-detail.vue
 delete mode 100644 apps/web-antd/src/views/property/roomBooking/participants/participants-modal.vue

diff --git a/apps/web-antd/src/api/property/roomBooking/participants/index.ts b/apps/web-antd/src/api/property/roomBooking/participants/index.ts
index e69e5d19..53a994a9 100644
--- a/apps/web-antd/src/api/property/roomBooking/participants/index.ts
+++ b/apps/web-antd/src/api/property/roomBooking/participants/index.ts
@@ -1,8 +1,6 @@
 import type { ParticipantsVO, ParticipantsForm, ParticipantsQuery } from './model';
-
 import type { ID, IDS } from '#/api/common';
 import type { PageResult } from '#/api/common';
-
 import { commonExport } from '#/api/helper';
 import { requestClient } from '#/api/request';
 
diff --git a/apps/web-antd/src/views/property/inspectionManagement/inspectionPoint/data.ts b/apps/web-antd/src/views/property/inspectionManagement/inspectionPoint/data.ts
index b6d51485..79c90c9b 100644
--- a/apps/web-antd/src/views/property/inspectionManagement/inspectionPoint/data.ts
+++ b/apps/web-antd/src/views/property/inspectionManagement/inspectionPoint/data.ts
@@ -112,6 +112,12 @@ export const modalSchema: FormSchemaGetter = () => [
     fieldName: 'nfcCode',
     component: 'Input',
   },
+  {
+    label: '巡检位置',
+    fieldName: 'inspectionLocation',
+    component: 'Input',
+    rules: 'required',
+  },
   {
     label: '备注',
     fieldName: 'remark',
diff --git a/apps/web-antd/src/views/property/room/floor-tree.vue b/apps/web-antd/src/views/property/room/floor-tree.vue
new file mode 100644
index 00000000..5eca1902
--- /dev/null
+++ b/apps/web-antd/src/views/property/room/floor-tree.vue
@@ -0,0 +1,122 @@
+<script setup lang="ts">
+import type { PropType } from 'vue';
+import type { DeptTree } from '#/api/system/user/model';
+import { onMounted, ref } from 'vue';
+import { SyncOutlined } from '@ant-design/icons-vue';
+import { Empty, InputSearch, Skeleton, Tree } from 'ant-design-vue';
+import { getDeptTree } from '#/api/system/user';
+
+defineOptions({ inheritAttrs: false });
+
+withDefaults(defineProps<{ showSearch?: boolean }>(), { showSearch: true });
+
+const emit = defineEmits<{
+  /**
+   * 点击刷新按钮的事件
+   */
+  reload: [];
+  /**
+   * 点击节点的事件
+   */
+  select: [];
+}>();
+
+const selectDeptId = defineModel('selectDeptId', {
+  required: true,
+  type: Array as PropType<string[]>,
+});
+
+const searchValue = defineModel('searchValue', {
+  type: String,
+  default: '',
+});
+
+/** 部门数据源 */
+type DeptTreeArray = DeptTree[];
+const deptTreeArray = ref<DeptTreeArray>([]);
+/** 骨架屏加载 */
+const showTreeSkeleton = ref<boolean>(true);
+
+async function loadTree() {
+  showTreeSkeleton.value = true;
+  searchValue.value = '';
+  selectDeptId.value = [];
+  const ret = await getDeptTree();
+  deptTreeArray.value = ret;
+  showTreeSkeleton.value = false;
+}
+
+async function handleReload() {
+  await loadTree();
+  emit('reload');
+}
+
+onMounted(loadTree);
+</script>
+
+<template>
+  <div :class="$attrs.class">
+    <Skeleton
+      :loading="showTreeSkeleton"
+      :paragraph="{ rows: 8 }"
+      active
+      class="p-[8px]"
+    >
+      <div
+        class="bg-background flex h-full flex-col overflow-y-auto rounded-lg"
+      >
+        <!-- 固定在顶部 必须加上bg-background背景色 否则会产生'穿透'效果 -->
+        <div
+          v-if="showSearch"
+          class="bg-background z-100 sticky left-0 top-0 p-[8px]"
+        >
+          <InputSearch
+            v-model:value="searchValue"
+            :placeholder="$t('pages.common.search')"
+            size="small"
+          >
+            <template #enterButton>
+              <a-button @click="handleReload">
+                <SyncOutlined class="text-primary" />
+              </a-button>
+            </template>
+          </InputSearch>
+        </div>
+        <div class="h-full overflow-x-hidden px-[8px]">
+          <Tree
+            v-bind="$attrs"
+            v-if="deptTreeArray.length > 0"
+            v-model:selected-keys="selectDeptId"
+            :class="$attrs.class"
+            :field-names="{ title: 'label', key: 'id' }"
+            :show-line="{ showLeafIcon: false }"
+            :tree-data="deptTreeArray"
+            :virtual="false"
+            default-expand-all
+            @select="$emit('select')"
+          >
+            <template #title="{ label }">
+              <span v-if="label.indexOf(searchValue) > -1">
+                {{ label.substring(0, label.indexOf(searchValue)) }}
+                <span style="color: #f50">{{ searchValue }}</span>
+                {{
+                  label.substring(
+                    label.indexOf(searchValue) + searchValue.length,
+                  )
+                }}
+              </span>
+              <span v-else>{{ label }}</span>
+            </template>
+          </Tree>
+          <!-- 仅本人数据权限 可以考虑直接不显示 -->
+          <div v-else class="mt-5">
+            <Empty
+              :image="Empty.PRESENTED_IMAGE_SIMPLE"
+              description="无部门数据"
+            />
+          </div>
+        </div>
+      </div>
+    </Skeleton>
+  </div>
+</template>
diff --git a/apps/web-antd/src/views/property/room/index.vue b/apps/web-antd/src/views/property/room/index.vue
index 89e8efaa..6cf9d254 100644
--- a/apps/web-antd/src/views/property/room/index.vue
+++ b/apps/web-antd/src/views/property/room/index.vue
@@ -1,18 +1,13 @@
 <script setup lang="ts">
-import type { Recordable } from '@vben/types';
-
-import { ref } from 'vue';
-
 import { Page, useVbenModal, type VbenFormProps } from '@vben/common-ui';
 import { getVxePopupContainer } from '@vben/utils';
-
 import { Modal, Popconfirm, Space } from 'ant-design-vue';
-import dayjs from 'dayjs';
+import FloorTree from "./floor-tree.vue"
 
-import {   
+import {
   useVbenVxeGrid,
   vxeCheckboxChecked,
-  type VxeGridProps 
+  type VxeGridProps
 } from '#/adapter/vxe-table';
 
 import {
@@ -125,58 +120,65 @@ function handleDownloadExcel() {
 </script>
 
 <template>
-  <Page :auto-content-height="true">
-    <BasicTable table-title="房间信息列表">
-      <template #toolbar-tools>
-        <Space>
-          <a-button
-            v-access:code="['property:room:export']"
-            @click="handleDownloadExcel"
-          >
-            {{ $t('pages.common.export') }}
-          </a-button>
-          <a-button
-            :disabled="!vxeCheckboxChecked(tableApi)"
-            danger
-            type="primary" 
-            v-access:code="['property:room:remove']" 
-            @click="handleMultiDelete">
-            {{ $t('pages.common.delete') }}
-          </a-button>
-          <a-button
-            type="primary"
-            v-access:code="['property:room:add']"
-            @click="handleAdd"
-          >
-            {{ $t('pages.common.add') }}
-          </a-button>
-        </Space>
-      </template>
-      <template #action="{ row }">
-        <Space>
-          <ghost-button
-            v-access:code="['property:room:edit']"
-            @click.stop="handleEdit(row)"
-          >
-            {{ $t('pages.common.edit') }}
-          </ghost-button>
-          <Popconfirm
-            :get-popup-container="getVxePopupContainer"
-            placement="left"
-            title="确认删除？"
-            @confirm="handleDelete(row)"
-          >
-            <ghost-button
-              danger
-              v-access:code="['property:room:remove']"
-              @click.stop=""
-            >
-              {{ $t('pages.common.delete') }}
-            </ghost-button>
-          </Popconfirm>
-        </Space>
-      </template>
-    </BasicTable>
-    <RoomModal @reload="tableApi.query()" />
-  </Page>
+  <div style="display: grid;grid-template-columns: 1fr 5fr;">
+    <div style="padding: 15px 0 15px 15px;background-color: red">
+      <FloorTree></FloorTree>
+    </div>
+    <div>
+      <Page :auto-content-height="true">
+        <BasicTable table-title="房间信息列表">
+          <template #toolbar-tools>
+            <Space>
+              <a-button
+                v-access:code="['property:room:export']"
+                @click="handleDownloadExcel"
+              >
+                {{ $t('pages.common.export') }}
+              </a-button>
+              <a-button
+                :disabled="!vxeCheckboxChecked(tableApi)"
+                danger
+                type="primary"
+                v-access:code="['property:room:remove']"
+                @click="handleMultiDelete">
+                {{ $t('pages.common.delete') }}
+              </a-button>
+              <a-button
+                type="primary"
+                v-access:code="['property:room:add']"
+                @click="handleAdd"
+              >
+                {{ $t('pages.common.add') }}
+              </a-button>
+            </Space>
+          </template>
+          <template #action="{ row }">
+            <Space>
+              <ghost-button
+                v-access:code="['property:room:edit']"
+                @click.stop="handleEdit(row)"
+              >
+                {{ $t('pages.common.edit') }}
+              </ghost-button>
+              <Popconfirm
+                :get-popup-container="getVxePopupContainer"
+                placement="left"
+                title="确认删除？"
+                @confirm="handleDelete(row)"
+              >
+                <ghost-button
+                  danger
+                  v-access:code="['property:room:remove']"
+                  @click.stop=""
+                >
+                  {{ $t('pages.common.delete') }}
+                </ghost-button>
+              </Popconfirm>
+            </Space>
+          </template>
+        </BasicTable>
+        <RoomModal @reload="tableApi.query()" />
+      </Page>
+    </div>
+  </div>
 </template>
diff --git a/apps/web-antd/src/views/property/roomBooking/participants/data.ts b/apps/web-antd/src/views/property/roomBooking/participants/data.ts
index 4400d58b..d6c2d548 100644
--- a/apps/web-antd/src/views/property/roomBooking/participants/data.ts
+++ b/apps/web-antd/src/views/property/roomBooking/participants/data.ts
@@ -1,35 +1,82 @@
 import type { FormSchemaGetter } from '#/adapter/form';
 import type { VxeGridProps } from '#/adapter/vxe-table';
-
+import { personList } from '#/api/property/resident/person';
+import {participantsList} from '#/api/property/roomBooking/participants';
 
 export const querySchema: FormSchemaGetter = () => [
   {
-    component: 'Input',
-    fieldName: 'meetId',
-    label: '会议室id',
+    label: '会议室名称',
+    fieldName: 'meetBookId',
+    component: 'ApiSelect',
+    componentProps: {
+      api: async () => {
+        const rows = await participantsList({ pageSize: 1000000000, pageNum: 1 });
+        return rows;
+      },
+      resultField: 'rows',
+      labelField: 'meetBookingVo.name',
+      valueField: 'meetBookId',
+    },
   },
   {
-    component: 'Input',
+    label: '发起人',
     fieldName: 'residentPersonId',
-    label: '入驻人员id',
+    component: 'ApiSelect',
+    componentProps: {
+      api: async () => {
+        const rows = await personList({ pageSize: 1000000000, pageNum: 1 });
+        return rows;
+      },
+      resultField: 'rows',
+      labelField: 'userName',
+      valueField: 'id',
+    },
   },
 ];
 
-// 需要使用i18n注意这里要改成getter形式 否则切换语言不会刷新
-// export const columns: () => VxeGridProps['columns'] = () => [
 export const columns: VxeGridProps['columns'] = [
-  { type: 'checkbox', width: 60 },
   {
-    title: '主键id',
-    field: 'id',
+    title: '会议室名称',
+    field: 'meetBookingVo.name',
   },
   {
-    title: '会议室id',
-    field: 'meetId',
+    title: '会议主题',
+    field: 'meetBookingVo.meetTheme',
   },
   {
-    title: '入驻人员id',
-    field: 'residentPersonId',
+    title: '会议时间',
+    field: 'meetBookingVo.meetingTime',
+    slots: {
+      default: ({row}) => {
+        return row.meetBookingVo.scheduledStarttime+'~'+row.meetBookingVo.scheduledEndtime;
+      },
+    },
+    width:300
+  },
+  {
+    title: '发起人',
+    field: 'meetBookingVo.personName',
+  },
+  {
+    title: '发起单位',
+    field: 'meetBookingVo.unitName',
+  },
+  {
+    title: '会议室地点',
+    field: 'meetBookingVo.meetLocation',
+  },
+  {
+    title: '签到状态',
+    field: 'signState',
+    slots: {
+      default: ({row}) => {
+        return row.signState === '0' ? '未签到' : '已签到';
+      },
+    },
+  },
+  {
+    title: '签到时间',
+    field: 'signTime',
   },
   {
     field: 'action',
@@ -39,27 +86,3 @@ export const columns: VxeGridProps['columns'] = [
     width: 180,
   },
 ];
-
-export const modalSchema: FormSchemaGetter = () => [
-  {
-    label: '主键id',
-    fieldName: 'id',
-    component: 'Input',
-    dependencies: {
-      show: () => false,
-      triggerFields: [''],
-    },
-  },
-  {
-    label: '会议室id',
-    fieldName: 'meetId',
-    component: 'Input',
-    rules: 'required',
-  },
-  {
-    label: '入驻人员id',
-    fieldName: 'residentPersonId',
-    component: 'Input',
-    rules: 'required',
-  },
-];
diff --git a/apps/web-antd/src/views/property/roomBooking/participants/index.vue b/apps/web-antd/src/views/property/roomBooking/participants/index.vue
index 2fbd3def..92a0e8d1 100644
--- a/apps/web-antd/src/views/property/roomBooking/participants/index.vue
+++ b/apps/web-antd/src/views/property/roomBooking/participants/index.vue
@@ -1,25 +1,17 @@
 <script setup lang="ts">
-
 import { Page, useVbenModal, type VbenFormProps } from '@vben/common-ui';
-import { getVxePopupContainer } from '@vben/utils';
-
-import { Modal, Popconfirm, Space } from 'ant-design-vue';
-
+import { Space } from 'ant-design-vue';
 import {
   useVbenVxeGrid,
-  vxeCheckboxChecked,
   type VxeGridProps
 } from '#/adapter/vxe-table';
-
 import {
   participantsExport,
   participantsList,
-  participantsRemove,
 } from '#/api/property/roomBooking/participants';
 import type { ParticipantsForm } from '#/api/property/roomBooking/participants/model';
 import { commonDownloadExcel } from '#/utils/file/download';
-
-import participantsModal from './participants-modal.vue';
+import participantsDetail from './participants-detail.vue';
 import { columns, querySchema } from './data';
 
 const formOptions: VbenFormProps = {
@@ -31,28 +23,13 @@ const formOptions: VbenFormProps = {
   },
   schema: querySchema(),
   wrapperClass: 'grid-cols-1 md:grid-cols-2 lg:grid-cols-3 xl:grid-cols-4',
-  // 处理区间选择器RangePicker时间格式 将一个字段映射为两个字段 搜索/导出会用到
-  // 不需要直接删除
-  // fieldMappingTime: [
-  //  [
-  //    'createTime',
-  //    ['params[beginTime]', 'params[endTime]'],
-  //    ['YYYY-MM-DD 00:00:00', 'YYYY-MM-DD 23:59:59'],
-  //  ],
-  // ],
 };
 
 const gridOptions: VxeGridProps = {
   checkboxConfig: {
-    // 高亮
     highlight: true,
-    // 翻页时保留选中状态
     reserve: true,
-    // 点击行选中
-    // trigger: 'row',
   },
-  // 需要使用i18n注意这里要改成getter形式 否则切换语言不会刷新
-  // columns: columns(),
   columns,
   height: 'auto',
   keepSource: true,
@@ -80,37 +57,13 @@ const [BasicTable, tableApi] = useVbenVxeGrid({
   gridOptions,
 });
 
-const [ParticipantsModal, modalApi] = useVbenModal({
-  connectedComponent: participantsModal,
+const [ParticipantsDetail, participantsDetailApi] = useVbenModal({
+  connectedComponent: participantsDetail,
 });
 
-function handleAdd() {
-  modalApi.setData({});
-  modalApi.open();
-}
-
-async function handleEdit(row: Required<ParticipantsForm>) {
-  modalApi.setData({ id: row.id });
-  modalApi.open();
-}
-
-async function handleDelete(row: Required<ParticipantsForm>) {
-  await participantsRemove(row.id);
-  await tableApi.query();
-}
-
-function handleMultiDelete() {
-  const rows = tableApi.grid.getCheckboxRecords();
-  const ids = rows.map((row: Required<ParticipantsForm>) => row.id);
-  Modal.confirm({
-    title: '提示',
-    okType: 'danger',
-    content: `确认删除选中的${ids.length}条记录吗？`,
-    onOk: async () => {
-      await participantsRemove(ids);
-      await tableApi.query();
-    },
-  });
+async function handleInfo(row: Required<ParticipantsForm>) {
+  participantsDetailApi.setData({ id: row.id });
+  participantsDetailApi.open();
 }
 
 function handleDownloadExcel() {
@@ -131,48 +84,18 @@ function handleDownloadExcel() {
           >
             {{ $t('pages.common.export') }}
           </a-button>
-          <a-button
-            :disabled="!vxeCheckboxChecked(tableApi)"
-            danger
-            type="primary"
-            v-access:code="['property:participants:remove']"
-            @click="handleMultiDelete">
-            {{ $t('pages.common.delete') }}
-          </a-button>
-          <a-button
-            type="primary"
-            v-access:code="['property:participants:add']"
-            @click="handleAdd"
-          >
-            {{ $t('pages.common.add') }}
-          </a-button>
         </Space>
       </template>
       <template #action="{ row }">
         <Space>
           <ghost-button
-            v-access:code="['property:participants:edit']"
-            @click.stop="handleEdit(row)"
+            @click.stop="handleInfo(row)"
           >
-            {{ $t('pages.common.edit') }}
+            {{ $t('pages.common.info') }}
           </ghost-button>
-          <Popconfirm
-            :get-popup-container="getVxePopupContainer"
-            placement="left"
-            title="确认删除？"
-            @confirm="handleDelete(row)"
-          >
-            <ghost-button
-              danger
-              v-access:code="['property:participants:remove']"
-              @click.stop=""
-            >
-              {{ $t('pages.common.delete') }}
-            </ghost-button>
-          </Popconfirm>
         </Space>
       </template>
     </BasicTable>
-    <ParticipantsModal @reload="tableApi.query()" />
+    <ParticipantsDetail/>
   </Page>
 </template>
diff --git a/apps/web-antd/src/views/property/roomBooking/participants/participants-detail.vue b/apps/web-antd/src/views/property/roomBooking/participants/participants-detail.vue
new file mode 100644
index 00000000..2a0ff20c
--- /dev/null
+++ b/apps/web-antd/src/views/property/roomBooking/participants/participants-detail.vue
@@ -0,0 +1,82 @@
+<script setup lang="ts">
+import type {ParticipantsVO} from '#/api/property/roomBooking/participants/model';
+import {shallowRef} from 'vue';
+import {useVbenModal} from '@vben/common-ui';
+import {Descriptions, DescriptionsItem} from 'ant-design-vue';
+import {participantsInfo} from '#/api/property/roomBooking/participants';
+import {ossInfo} from "#/api/system/oss";
+
+const [BasicModal, modalApi] = useVbenModal({
+  onOpenChange: handleOpenChange,
+  onClosed() {
+    ParticipantsDetail.value = null;
+  },
+});
+
+const ParticipantsDetail = shallowRef<null | ParticipantsVO>(null);
+
+async function handleOpenChange(open: boolean) {
+  if (!open) {
+    return null;
+  }
+  modalApi.modalLoading(true);
+  const {id} = modalApi.getData() as { id: number | string };
+  ParticipantsDetail.value = await participantsInfo(id);
+  try {
+    if (ParticipantsDetail.value.residentPersonVo.img) {
+      const res = await ossInfo([ParticipantsDetail.value.residentPersonVo.img]);
+      ParticipantsDetail.value.residentPersonVo.img = res?.[0]?.url
+    }
+  } catch (e) {}
+
+  modalApi.modalLoading(false);
+}
+</script>
+
+<template>
+  <BasicModal :footer="false" :fullscreen-button="false" title="会议室详情" class="w-[70%]">
+    <Descriptions v-if="ParticipantsDetail" size="small" :column="2" bordered
+                  :labelStyle="{width:'120px'}">
+      <DescriptionsItem label="会议室名称">
+        {{ ParticipantsDetail.meetBookingVo.name }}
+      </DescriptionsItem>
+      <DescriptionsItem label="会议主题">
+        {{ ParticipantsDetail.meetBookingVo.meetTheme }}
+      </DescriptionsItem>
+      <DescriptionsItem label="会议时间">
+        {{ ParticipantsDetail.meetBookingVo.scheduledStarttime }}
+      </DescriptionsItem>
+      <DescriptionsItem label="发起人">
+        {{ ParticipantsDetail.meetBookingVo.personName }}
+      </DescriptionsItem>
+      <DescriptionsItem label="发起单位">
+        {{ ParticipantsDetail.meetBookingVo.unitName }}
+      </DescriptionsItem>
+      <DescriptionsItem label="会议室地点">
+        {{ ParticipantsDetail.meetBookingVo.meetLocation }}
+      </DescriptionsItem>
+
+      <DescriptionsItem label="参会姓名">
+        {{ ParticipantsDetail.residentPersonVo.userName }}
+      </DescriptionsItem>
+      <DescriptionsItem label="证件号">
+        {{ ParticipantsDetail.residentPersonVo.idCard }}
+      </DescriptionsItem>
+      <DescriptionsItem label="所属公司">
+        {{ ParticipantsDetail.residentPersonVo.unitName }}
+      </DescriptionsItem>
+      <DescriptionsItem label="联系电话">
+        {{ ParticipantsDetail.residentPersonVo.phone }}
+      </DescriptionsItem>
+      <DescriptionsItem label="人脸图片" v-if="ParticipantsDetail.residentPersonVo.img" :span="2">
+        <img :src="ParticipantsDetail.residentPersonVo.img" alt="图片加载失败"  class="w-[100px] h-[100px]"/>
+      </DescriptionsItem>
+      <DescriptionsItem label="签到状态">
+        {{ ParticipantsDetail.signState === '0' ? '未签到' : '已签到'}}
+      </DescriptionsItem>
+      <DescriptionsItem label="签到时间">
+        {{ ParticipantsDetail.signTime }}
+      </DescriptionsItem>
+    </Descriptions>
+  </BasicModal>
+</template>
diff --git a/apps/web-antd/src/views/property/roomBooking/participants/participants-modal.vue b/apps/web-antd/src/views/property/roomBooking/participants/participants-modal.vue
deleted file mode 100644
index 4972eaa2..00000000
--- a/apps/web-antd/src/views/property/roomBooking/participants/participants-modal.vue
+++ /dev/null
@@ -1,101 +0,0 @@
-<script setup lang="ts">
-import { computed, ref } from 'vue';
-
-import { useVbenModal } from '@vben/common-ui';
-import { $t } from '@vben/locales';
-import { cloneDeep } from '@vben/utils';
-
-import { useVbenForm } from '#/adapter/form';
-import { participantsAdd, participantsInfo, participantsUpdate } from '#/api/property/roomBooking/participants';
-import { defaultFormValueGetter, useBeforeCloseDiff } from '#/utils/popup';
-
-import { modalSchema } from './data';
-
-const emit = defineEmits<{ reload: [] }>();
-
-const isUpdate = ref(false);
-const title = computed(() => {
-  return isUpdate.value ? $t('pages.common.edit') : $t('pages.common.add');
-});
-
-const [BasicForm, formApi] = useVbenForm({
-  commonConfig: {
-    // 默认占满两列
-    formItemClass: 'col-span-2',
-    // 默认label宽度 px
-    labelWidth: 80,
-    // 通用配置项 会影响到所有表单项
-    componentProps: {
-      class: 'w-full',
-    }
-  },
-  schema: modalSchema(),
-  showDefaultActions: false,
-  wrapperClass: 'grid-cols-2',
-});
-
-const { onBeforeClose, markInitialized, resetInitialized } = useBeforeCloseDiff(
-  {
-    initializedGetter: defaultFormValueGetter(formApi),
-    currentGetter: defaultFormValueGetter(formApi),
-  },
-);
-
-const [BasicModal, modalApi] = useVbenModal({
-  // 在这里更改宽度
-  class: 'w-[550px]',
-  fullscreenButton: false,
-  onBeforeClose,
-  onClosed: handleClosed,
-  onConfirm: handleConfirm,
-  onOpenChange: async (isOpen) => {
-    if (!isOpen) {
-      return null;
-    }
-    modalApi.modalLoading(true);
-
-    const { id } = modalApi.getData() as { id?: number | string };
-    isUpdate.value = !!id;
-
-    if (isUpdate.value && id) {
-      const record = await participantsInfo(id);
-      await formApi.setValues(record);
-    }
-    await markInitialized();
-
-    modalApi.modalLoading(false);
-  },
-});
-
-async function handleConfirm() {
-  try {
-    modalApi.lock(true);
-    const { valid } = await formApi.validate();
-    if (!valid) {
-      return;
-    }
-    // getValues获取为一个readonly的对象 需要修改必须先深拷贝一次
-    const data = cloneDeep(await formApi.getValues());
-    await (isUpdate.value ? participantsUpdate(data) : participantsAdd(data));
-    resetInitialized();
-    emit('reload');
-    modalApi.close();
-  } catch (error) {
-    console.error(error);
-  } finally {
-    modalApi.lock(false);
-  }
-}
-
-async function handleClosed() {
-  await formApi.resetForm();
-  resetInitialized();
-}
-</script>
-
-<template>
-  <BasicModal :title="title">
-    <BasicForm />
-  </BasicModal>
-</template>
-
diff --git a/apps/web-antd/vite.config.mts b/apps/web-antd/vite.config.mts
index fcce105a..ded7ff75 100644
--- a/apps/web-antd/vite.config.mts
+++ b/apps/web-antd/vite.config.mts
@@ -27,7 +27,7 @@ export default defineConfig(async () => {
             changeOrigin: true,
             rewrite: (path) => path.replace(/^\/api/, ''),
             // mock代理目标地址
-            target: 'http://183.230.235.66:11010/api/',
+            target: 'http://192.168.1.110:8080',
             ws: true,
           },
         },

From 0ffe547df84df8776e28aa26efc226a56f937367 Mon Sep 17 00:00:00 2001
From: dev_ljl <2590379346@qq.com>
Date: Thu, 4 Sep 2025 16:19:47 +0800
Subject: [PATCH 14/30] =?UTF-8?q?feat:=E8=A7=86=E9=A2=91=E9=A2=84=E8=AD=A6?=
 =?UTF-8?q?=E8=AF=A6=E6=83=85=E5=AD=97=E6=AE=B5=E6=8F=8F=E8=BF=B0=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../videoWarning/videoWarningHasDone/data.ts  | 12 ++---
 .../videoWarningHasDone/warning-detail.vue    | 39 ++++++++--------
 .../videoWarningProcessing/data.ts            | 12 ++---
 .../videoWarningProcessing/warning-detail.vue | 44 +++++++++----------
 .../videoWarning/videoWarningToDone/data.ts   | 38 ++++++++--------
 .../videoWarningToDone/warning-detail.vue     | 41 +++++++----------
 6 files changed, 86 insertions(+), 100 deletions(-)

diff --git a/apps/web-antd/src/views/videoSystem/videoWarning/videoWarningHasDone/data.ts b/apps/web-antd/src/views/videoSystem/videoWarning/videoWarningHasDone/data.ts
index 2f2e89a3..e939bf2b 100644
--- a/apps/web-antd/src/views/videoSystem/videoWarning/videoWarningHasDone/data.ts
+++ b/apps/web-antd/src/views/videoSystem/videoWarning/videoWarningHasDone/data.ts
@@ -21,7 +21,7 @@ export const querySchema: FormSchemaGetter = () => [
       options: getDictOptions(DictEnum.alarm_level, true),
     },
     fieldName: 'level',
-    label: '级别',
+    label: '预警级别',
   },
   /*{
     component: 'Select',
@@ -45,7 +45,7 @@ export const columns: VxeGridProps['columns'] = [
     field: 'reportTime',
   },
   {
-    title: '设备ip',
+    title: '设备IP',
     field: 'deviceIp',
   },
   {
@@ -53,7 +53,7 @@ export const columns: VxeGridProps['columns'] = [
     field: 'deviceName',
   },
   {
-    title: '级别',
+    title: '预警级别',
     field: 'level',
     slots: {
       default: ({ row }: any) => {
@@ -138,7 +138,7 @@ export const modalSchema: FormSchemaGetter = () => [
     disabled: true,
   },
   {
-    label: '设备名称',
+    label: '设备IP',
     fieldName: 'deviceIp',
     component: 'Input',
     disabled: true,
@@ -152,7 +152,7 @@ export const modalSchema: FormSchemaGetter = () => [
     rules: 'required',
   },
   {
-    label: '重要级别',
+    label: '预警级别',
     fieldName: 'level',
     component: 'Select',
     disabled: true,
@@ -185,7 +185,7 @@ export const modalSchema: FormSchemaGetter = () => [
     rules: 'selectRequired',
   },
   {
-    label: '描述',
+    label: '预警描述',
     disabled: true,
     fieldName: 'description',
     component: 'Textarea',
diff --git a/apps/web-antd/src/views/videoSystem/videoWarning/videoWarningHasDone/warning-detail.vue b/apps/web-antd/src/views/videoSystem/videoWarning/videoWarningHasDone/warning-detail.vue
index 755d9fcc..2e0dd845 100644
--- a/apps/web-antd/src/views/videoSystem/videoWarning/videoWarningHasDone/warning-detail.vue
+++ b/apps/web-antd/src/views/videoSystem/videoWarning/videoWarningHasDone/warning-detail.vue
@@ -72,15 +72,24 @@ function loadProcessList() {
       :labelStyle="{ width: '120px' }"
       style="margin-bottom: 30px"
     >
-      <DescriptionsItem label="预警编号">
+      <DescriptionsItem label="预警编码">
         {{ warningDetail.id }}
       </DescriptionsItem>
-
-      <DescriptionsItem label="预警时间">
-        {{ warningDetail.reportTime }}
+      <DescriptionsItem label="预警类型">
+        {{ warningDetail.bigTypeName + ' - ' + warningDetail.smallTypeName }}
       </DescriptionsItem>
 
-      <DescriptionsItem label="级别">
+      <DescriptionsItem label="设备IP"
+      >{{ warningDetail.deviceIp }}
+      </DescriptionsItem>
+
+      <DescriptionsItem label="设备名称"
+      >{{ warningDetail.deviceName }}
+      </DescriptionsItem>
+      <DescriptionsItem label="预警位置" :span="2">
+        {{ warningDetail.deviceName }}
+      </DescriptionsItem>
+      <DescriptionsItem label="预警级别">
         <Tag
           :color="
             warningDetail.level === '特大'
@@ -93,27 +102,15 @@ function loadProcessList() {
           {{ warningDetail.levelName }}
         </Tag>
       </DescriptionsItem>
-
-      <DescriptionsItem label="预警类型">
-        {{ warningDetail.bigTypeName + ' - ' + warningDetail.smallTypeName }}
+      <DescriptionsItem label="预警时间">
+        {{ warningDetail.reportTime }}
       </DescriptionsItem>
 
-      <DescriptionsItem label="设备ip"
-        >{{ warningDetail.deviceIp }}
-      </DescriptionsItem>
-
-      <DescriptionsItem label="设备ip"
-        >{{ warningDetail.deviceName }}
-      </DescriptionsItem>
-
-      <DescriptionsItem label="描述" :span="2">
+      <DescriptionsItem label="预警描述" :span="2">
         {{ warningDetail.description }}
       </DescriptionsItem>
 
-      <DescriptionsItem label="所在位置" :span="2">
-        {{ warningDetail.deviceName }}
-      </DescriptionsItem>
-      <DescriptionsItem :span="2" label="附件信息">
+      <DescriptionsItem :span="2" label="相关图片">
         <div class="file-box">
           <div class="img-box" v-for="item in currFiles">
             <Image
diff --git a/apps/web-antd/src/views/videoSystem/videoWarning/videoWarningProcessing/data.ts b/apps/web-antd/src/views/videoSystem/videoWarning/videoWarningProcessing/data.ts
index 2f2e89a3..e939bf2b 100644
--- a/apps/web-antd/src/views/videoSystem/videoWarning/videoWarningProcessing/data.ts
+++ b/apps/web-antd/src/views/videoSystem/videoWarning/videoWarningProcessing/data.ts
@@ -21,7 +21,7 @@ export const querySchema: FormSchemaGetter = () => [
       options: getDictOptions(DictEnum.alarm_level, true),
     },
     fieldName: 'level',
-    label: '级别',
+    label: '预警级别',
   },
   /*{
     component: 'Select',
@@ -45,7 +45,7 @@ export const columns: VxeGridProps['columns'] = [
     field: 'reportTime',
   },
   {
-    title: '设备ip',
+    title: '设备IP',
     field: 'deviceIp',
   },
   {
@@ -53,7 +53,7 @@ export const columns: VxeGridProps['columns'] = [
     field: 'deviceName',
   },
   {
-    title: '级别',
+    title: '预警级别',
     field: 'level',
     slots: {
       default: ({ row }: any) => {
@@ -138,7 +138,7 @@ export const modalSchema: FormSchemaGetter = () => [
     disabled: true,
   },
   {
-    label: '设备名称',
+    label: '设备IP',
     fieldName: 'deviceIp',
     component: 'Input',
     disabled: true,
@@ -152,7 +152,7 @@ export const modalSchema: FormSchemaGetter = () => [
     rules: 'required',
   },
   {
-    label: '重要级别',
+    label: '预警级别',
     fieldName: 'level',
     component: 'Select',
     disabled: true,
@@ -185,7 +185,7 @@ export const modalSchema: FormSchemaGetter = () => [
     rules: 'selectRequired',
   },
   {
-    label: '描述',
+    label: '预警描述',
     disabled: true,
     fieldName: 'description',
     component: 'Textarea',
diff --git a/apps/web-antd/src/views/videoSystem/videoWarning/videoWarningProcessing/warning-detail.vue b/apps/web-antd/src/views/videoSystem/videoWarning/videoWarningProcessing/warning-detail.vue
index eb5f613f..fea8dd66 100644
--- a/apps/web-antd/src/views/videoSystem/videoWarning/videoWarningProcessing/warning-detail.vue
+++ b/apps/web-antd/src/views/videoSystem/videoWarning/videoWarningProcessing/warning-detail.vue
@@ -70,15 +70,23 @@ function loadProcessList() {
       :labelStyle="{ width: '120px' }"
       style="margin-bottom: 30px"
     >
-      <DescriptionsItem label="预警编号">
+      <DescriptionsItem label="预警编码">
         {{ warningDetail.id }}
       </DescriptionsItem>
-
-      <DescriptionsItem label="预警时间">
-        {{ warningDetail.reportTime }}
+      <DescriptionsItem label="预警类型">
+        {{ warningDetail.bigTypeName + ' - ' + warningDetail.smallTypeName }}
+      </DescriptionsItem>
+      <DescriptionsItem label="设备IP"
+      >{{ warningDetail.deviceIp }}
       </DescriptionsItem>
 
-      <DescriptionsItem label="级别">
+      <DescriptionsItem label="设备名称"
+      >{{ warningDetail.deviceName }}
+      </DescriptionsItem>
+      <DescriptionsItem label="预警位置" :span="2">
+        {{ warningDetail.deviceName }}
+      </DescriptionsItem>
+      <DescriptionsItem label="预警级别">
         <Tag
           :color="
             warningDetail.level === '特大'
@@ -91,28 +99,16 @@ function loadProcessList() {
           {{ warningDetail.levelName }}
         </Tag>
       </DescriptionsItem>
-
-      <DescriptionsItem label="预警类型">
-        {{ warningDetail.bigTypeName + ' - ' + warningDetail.smallTypeName }}
+      <DescriptionsItem label="预警时间">
+        {{ warningDetail.reportTime }}
       </DescriptionsItem>
-
-      <DescriptionsItem label="设备ip"
-        >{{ warningDetail.deviceIp }}
-      </DescriptionsItem>
-
-      <DescriptionsItem label="设备ip"
-        >{{ warningDetail.deviceName }}
-      </DescriptionsItem>
-
-      <DescriptionsItem label="描述" :span="2">
+      <DescriptionsItem label="预警描述" :span="2">
         {{ warningDetail.description }}
       </DescriptionsItem>
 
-      <DescriptionsItem label="所在位置">
-        {{ warningDetail.deviceName }}
-      </DescriptionsItem>
 
-      <DescriptionsItem label="处理状态">
+
+      <DescriptionsItem label="处理状态" :span="2">
         <Tag color="processing">
           {{ warningDetail.stateName }}
         </Tag>
@@ -126,7 +122,7 @@ function loadProcessList() {
         {{ warningDetail.processingTime || '-' }}
       </DescriptionsItem>-->
 
-      <DescriptionsItem :span="1" label="附件信息">
+      <DescriptionsItem :span="2" label="相关图片">
         <div class="file-box">
           <div class="img-box" v-for="item in currFiles">
             <Image
@@ -138,7 +134,7 @@ function loadProcessList() {
         </div>
       </DescriptionsItem>
 
-      <DescriptionsItem :span="1" label="报警视频"></DescriptionsItem>
+      <DescriptionsItem :span="2" label="报警视频"></DescriptionsItem>
     </Descriptions>
   </BasicModal>
 </template>
diff --git a/apps/web-antd/src/views/videoSystem/videoWarning/videoWarningToDone/data.ts b/apps/web-antd/src/views/videoSystem/videoWarning/videoWarningToDone/data.ts
index d9a81d28..b6513a58 100644
--- a/apps/web-antd/src/views/videoSystem/videoWarning/videoWarningToDone/data.ts
+++ b/apps/web-antd/src/views/videoSystem/videoWarning/videoWarningToDone/data.ts
@@ -22,7 +22,7 @@ export const querySchema: FormSchemaGetter = () => [
       options: getDictOptions(DictEnum.alarm_level, true),
     },
     fieldName: 'level',
-    label: '级别',
+    label: '预警级别',
   },
   /*{
     component: 'Select',
@@ -46,7 +46,7 @@ export const columns: VxeGridProps['columns'] = [
     field: 'reportTime',
   },
   {
-    title: '设备ip',
+    title: '设备IP',
     field: 'deviceIp',
   },
   {
@@ -54,7 +54,7 @@ export const columns: VxeGridProps['columns'] = [
     field: 'deviceName',
   },
   {
-    title: '级别',
+    title: '预警级别',
     field: 'level',
     slots: {
       default: ({ row }: any) => {
@@ -139,7 +139,7 @@ export const modalSchema: FormSchemaGetter = () => [
     disabled: true,
   },
   {
-    label: '设备名称',
+    label: '设备IP',
     fieldName: 'deviceIp',
     component: 'Input',
     disabled: true,
@@ -153,7 +153,7 @@ export const modalSchema: FormSchemaGetter = () => [
     rules: 'required',
   },
   {
-    label: '重要级别',
+    label: '预警级别',
     fieldName: 'level',
     component: 'Select',
     disabled: true,
@@ -186,7 +186,7 @@ export const modalSchema: FormSchemaGetter = () => [
     rules: 'selectRequired',
   },
   {
-    label: '描述',
+    label: '预警描述',
     disabled: true,
     fieldName: 'description',
     component: 'Textarea',
@@ -196,6 +196,19 @@ export const modalSchema: FormSchemaGetter = () => [
     },
   },
 
+
+  // 插入分割线
+  {
+    component: 'Divider',
+    fieldName: '_divider',
+    formItemClass: 'col-span-2',
+    hideLabel: true,
+    renderComponentContent: () => {
+      return {
+        default: () => h('div', '处理'),
+      };
+    },
+  },
   {
     label: '处理人',
     fieldName: 'solveName',
@@ -212,19 +225,6 @@ export const modalSchema: FormSchemaGetter = () => [
     fieldName: 'solveEmail',
     component: 'Input',
   },
-  // 插入分割线
-  {
-    component: 'Divider',
-    fieldName: '_divider',
-    formItemClass: 'col-span-2',
-    hideLabel: true,
-    renderComponentContent: () => {
-      return {
-        default: () => h('div', '处理'),
-      };
-    },
-  },
-
   {
     label: '备注',
     fieldName: 'remark',
diff --git a/apps/web-antd/src/views/videoSystem/videoWarning/videoWarningToDone/warning-detail.vue b/apps/web-antd/src/views/videoSystem/videoWarning/videoWarningToDone/warning-detail.vue
index dc0fa3eb..112bd749 100644
--- a/apps/web-antd/src/views/videoSystem/videoWarning/videoWarningToDone/warning-detail.vue
+++ b/apps/web-antd/src/views/videoSystem/videoWarning/videoWarningToDone/warning-detail.vue
@@ -70,15 +70,23 @@ function loadProcessList() {
       :labelStyle="{ width: '120px' }"
       style="margin-bottom: 30px"
     >
-      <DescriptionsItem label="预警编号">
+      <DescriptionsItem label="预警编码">
         {{ warningDetail.id }}
       </DescriptionsItem>
-
-      <DescriptionsItem label="预警时间">
-        {{ warningDetail.reportTime }}
+      <DescriptionsItem label="预警类型">
+        {{ warningDetail.bigTypeName + ' - ' + warningDetail.smallTypeName }}
+      </DescriptionsItem>
+      <DescriptionsItem label="设备IP"
+      >{{ warningDetail.deviceIp }}
       </DescriptionsItem>
 
-      <DescriptionsItem label="级别">
+      <DescriptionsItem label="设备名称"
+      >{{ warningDetail.deviceName }}
+      </DescriptionsItem>
+      <DescriptionsItem label="预警位置" :span="2">
+        {{ warningDetail.deviceName }}
+      </DescriptionsItem>
+      <DescriptionsItem label="预警级别">
         <Tag
           :color="
             warningDetail.level === '特大'
@@ -91,28 +99,13 @@ function loadProcessList() {
           {{ warningDetail.levelName }}
         </Tag>
       </DescriptionsItem>
-
-      <DescriptionsItem label="预警类型">
-        {{ warningDetail.bigTypeName + ' - ' + warningDetail.smallTypeName }}
+      <DescriptionsItem label="预警时间">
+        {{ warningDetail.reportTime }}
       </DescriptionsItem>
-
-      <DescriptionsItem label="设备ip"
-      >{{ warningDetail.deviceIp }}
-      </DescriptionsItem>
-
-      <DescriptionsItem label="设备ip"
-      >{{ warningDetail.deviceName }}
-      </DescriptionsItem>
-
-      <DescriptionsItem label="描述" :span="2">
+      <DescriptionsItem label="预警描述" :span="2">
         {{ warningDetail.description }}
       </DescriptionsItem>
-
-      <DescriptionsItem label="所在位置" :span="2">
-        {{ warningDetail.deviceName }}
-      </DescriptionsItem>
-
-      <DescriptionsItem label="附件信息"  :span="2">
+      <DescriptionsItem label="相关图片"  :span="2">
         <div class="file-box">
           <div class="img-box" v-for="item in currFiles">
             <Image

From 9cefe1847ebe7810e158b290b945976dd272ab83 Mon Sep 17 00:00:00 2001
From: FLL <2162874245@qq.com>
Date: Thu, 4 Sep 2025 17:02:24 +0800
Subject: [PATCH 15/30] feat

---
 .../property/building/building-modal.vue      |   2 +-
 .../src/views/property/building/data.tsx      |  46 ++++++++
 .../web-antd/src/views/property/floor/data.ts |  50 ++++++++
 .../src/views/property/floor/floor-modal.vue  |   6 +-
 .../src/views/property/room/floor-tree.vue    |   4 +-
 .../src/views/property/room/index.vue         | 108 +++++++++---------
 6 files changed, 154 insertions(+), 62 deletions(-)

diff --git a/apps/web-antd/src/views/property/building/building-modal.vue b/apps/web-antd/src/views/property/building/building-modal.vue
index 0f56dc1a..366bd7c5 100644
--- a/apps/web-antd/src/views/property/building/building-modal.vue
+++ b/apps/web-antd/src/views/property/building/building-modal.vue
@@ -23,7 +23,7 @@ const [BasicForm, formApi] = useVbenForm({
     // 默认占满两列
     formItemClass: 'col-span-1',
     // 默认label宽度 px
-    labelWidth: 80,
+    labelWidth: 90,
     // 通用配置项 会影响到所有表单项
     componentProps: {
       class: 'w-full',
diff --git a/apps/web-antd/src/views/property/building/data.tsx b/apps/web-antd/src/views/property/building/data.tsx
index 289e1d1b..cd610bad 100644
--- a/apps/web-antd/src/views/property/building/data.tsx
+++ b/apps/web-antd/src/views/property/building/data.tsx
@@ -49,6 +49,10 @@ export const columns: VxeGridProps['columns'] = [
     title: '建筑名称',
     field: 'buildingName',
   },
+  {
+    title: '社区',
+    field: 'communityText',
+  },
   {
     title: '总层数',
     field: 'floorCount',
@@ -73,6 +77,18 @@ export const columns: VxeGridProps['columns'] = [
     title: '地址',
     field: 'addr',
   },
+  {
+    title: '建筑面积(㎡)',
+    field: 'area',
+  },
+  {
+    title: '套内面积(㎡)',
+    field: 'insideInArea',
+  },
+  {
+    title: '公摊面积(㎡)',
+    field: 'sharedArea',
+  },
   {
     field: 'action',
     fixed: 'right',
@@ -153,4 +169,34 @@ export const modalSchema: FormSchemaGetter = () => [
     component: 'Input',
     rules: 'required',
   },
+  {
+    label: '建筑面积(㎡)',
+    fieldName: 'area',
+    component: 'InputNumber',
+    componentProps: {
+      min:0,
+      precision:2,
+    },
+    rules: 'required',
+  },
+  {
+    label: '套内面积(㎡)',
+    fieldName: 'insideInArea',
+    component: 'InputNumber',
+    componentProps: {
+      min:0,
+      precision:2,
+    },
+    rules: 'required',
+  },
+  {
+    label: '公摊面积(㎡)',
+    fieldName: 'sharedArea',
+    component: 'InputNumber',
+    componentProps: {
+      min:0,
+      precision:2,
+    },
+    rules: 'required',
+  },
 ];
diff --git a/apps/web-antd/src/views/property/floor/data.ts b/apps/web-antd/src/views/property/floor/data.ts
index 59ba46b7..aa09282a 100644
--- a/apps/web-antd/src/views/property/floor/data.ts
+++ b/apps/web-antd/src/views/property/floor/data.ts
@@ -13,6 +13,14 @@ export const querySchema: FormSchemaGetter = () => [
 // export const columns: () => VxeGridProps['columns'] = () => [
 export const columns: VxeGridProps['columns'] = [
   { type: 'checkbox', width: 60 },
+  {
+    title: '社区',
+    field: 'communityText',
+  },
+  {
+    title: '建筑',
+    field: 'buildingText',
+  },
   {
     title: '楼层名称',
     field: 'floorName',
@@ -33,6 +41,18 @@ export const columns: VxeGridProps['columns'] = [
     title: '层高',
     field: 'floorHeight',
   },
+  {
+    title: '建筑面积(㎡)',
+    field: 'area',
+  },
+  {
+    title: '套内面积(㎡)',
+    field: 'insideInArea',
+  },
+  {
+    title: '公摊面积(㎡)',
+    field: 'sharedArea',
+  },
   {
     field: 'action',
     fixed: 'right',
@@ -95,4 +115,34 @@ export const modalSchema: FormSchemaGetter = () => [
       precision:0,
     },
   },
+  {
+    label: '建筑面积(㎡)',
+    fieldName: 'area',
+    component: 'InputNumber',
+    componentProps: {
+      min:0,
+      precision:2,
+    },
+    rules: 'required',
+  },
+  {
+    label: '套内面积(㎡)',
+    fieldName: 'insideInArea',
+    component: 'InputNumber',
+    componentProps: {
+      min:0,
+      precision:2,
+    },
+    rules: 'required',
+  },
+  {
+    label: '公摊面积(㎡)',
+    fieldName: 'sharedArea',
+    component: 'InputNumber',
+    componentProps: {
+      min:0,
+      precision:2,
+    },
+    rules: 'required',
+  },
 ];
diff --git a/apps/web-antd/src/views/property/floor/floor-modal.vue b/apps/web-antd/src/views/property/floor/floor-modal.vue
index 5fc17d33..072bec45 100644
--- a/apps/web-antd/src/views/property/floor/floor-modal.vue
+++ b/apps/web-antd/src/views/property/floor/floor-modal.vue
@@ -22,9 +22,9 @@ const title = computed(() => {
 const [BasicForm, formApi] = useVbenForm({
   commonConfig: {
     // 默认占满两列
-    formItemClass: 'col-span-2',
+    formItemClass: 'col-span-1',
     // 默认label宽度 px
-    labelWidth: 80,
+    labelWidth: 90,
     // 通用配置项 会影响到所有表单项
     componentProps: {
       class: 'w-full',
@@ -44,7 +44,7 @@ const { onBeforeClose, markInitialized, resetInitialized } = useBeforeCloseDiff(
 
 const [BasicModal, modalApi] = useVbenModal({
   // 在这里更改宽度
-  class: 'w-[550px]',
+  class: 'w-[60%]',
   fullscreenButton: false,
   onBeforeClose,
   onClosed: handleClosed,
diff --git a/apps/web-antd/src/views/property/room/floor-tree.vue b/apps/web-antd/src/views/property/room/floor-tree.vue
index 5eca1902..75982f16 100644
--- a/apps/web-antd/src/views/property/room/floor-tree.vue
+++ b/apps/web-antd/src/views/property/room/floor-tree.vue
@@ -4,7 +4,7 @@ import type { DeptTree } from '#/api/system/user/model';
 import { onMounted, ref } from 'vue';
 import { SyncOutlined } from '@ant-design/icons-vue';
 import { Empty, InputSearch, Skeleton, Tree } from 'ant-design-vue';
-import { getDeptTree } from '#/api/system/user';
+import { communityTree } from '#/api/property/community';
 
 defineOptions({ inheritAttrs: false });
 
@@ -41,7 +41,7 @@ async function loadTree() {
   showTreeSkeleton.value = true;
   searchValue.value = '';
   selectDeptId.value = [];
-  const ret = await getDeptTree();
+  const ret = await communityTree(3);
   deptTreeArray.value = ret;
   showTreeSkeleton.value = false;
 }
diff --git a/apps/web-antd/src/views/property/room/index.vue b/apps/web-antd/src/views/property/room/index.vue
index 6cf9d254..6d62e994 100644
--- a/apps/web-antd/src/views/property/room/index.vue
+++ b/apps/web-antd/src/views/property/room/index.vue
@@ -120,65 +120,61 @@ function handleDownloadExcel() {
 </script>
 
 <template>
-  <div style="display: grid;grid-template-columns: 1fr 5fr;">
-    <div style="padding: 15px 0 15px 15px;background-color: red">
+  <Page :auto-content-height="true" style="width: 100%">
+    <div class="flex h-full gap-[15px]">
       <FloorTree></FloorTree>
-    </div>
-    <div>
-      <Page :auto-content-height="true">
-        <BasicTable table-title="房间信息列表">
-          <template #toolbar-tools>
-            <Space>
-              <a-button
-                v-access:code="['property:room:export']"
-                @click="handleDownloadExcel"
-              >
-                {{ $t('pages.common.export') }}
-              </a-button>
-              <a-button
-                :disabled="!vxeCheckboxChecked(tableApi)"
-                danger
-                type="primary"
-                v-access:code="['property:room:remove']"
-                @click="handleMultiDelete">
-                {{ $t('pages.common.delete') }}
-              </a-button>
-              <a-button
-                type="primary"
-                v-access:code="['property:room:add']"
-                @click="handleAdd"
-              >
-                {{ $t('pages.common.add') }}
-              </a-button>
-            </Space>
-          </template>
-          <template #action="{ row }">
-            <Space>
+      <BasicTable class="flex-1 overflow-hidden" table-title="房间信息列表">
+        <template #toolbar-tools>
+          <Space>
+            <a-button
+              v-access:code="['property:room:export']"
+              @click="handleDownloadExcel"
+            >
+              {{ $t('pages.common.export') }}
+            </a-button>
+            <a-button
+              :disabled="!vxeCheckboxChecked(tableApi)"
+              danger
+              type="primary"
+              v-access:code="['property:room:remove']"
+              @click="handleMultiDelete">
+              {{ $t('pages.common.delete') }}
+            </a-button>
+            <a-button
+              type="primary"
+              v-access:code="['property:room:add']"
+              @click="handleAdd"
+            >
+              {{ $t('pages.common.add') }}
+            </a-button>
+          </Space>
+        </template>
+        <template #action="{ row }">
+          <Space>
+            <ghost-button
+              v-access:code="['property:room:edit']"
+              @click.stop="handleEdit(row)"
+            >
+              {{ $t('pages.common.edit') }}
+            </ghost-button>
+            <Popconfirm
+              :get-popup-container="getVxePopupContainer"
+              placement="left"
+              title="确认删除？"
+              @confirm="handleDelete(row)"
+            >
               <ghost-button
-                v-access:code="['property:room:edit']"
-                @click.stop="handleEdit(row)"
+                danger
+                v-access:code="['property:room:remove']"
+                @click.stop=""
               >
-                {{ $t('pages.common.edit') }}
+                {{ $t('pages.common.delete') }}
               </ghost-button>
-              <Popconfirm
-                :get-popup-container="getVxePopupContainer"
-                placement="left"
-                title="确认删除？"
-                @confirm="handleDelete(row)"
-              >
-                <ghost-button
-                  danger
-                  v-access:code="['property:room:remove']"
-                  @click.stop=""
-                >
-                  {{ $t('pages.common.delete') }}
-                </ghost-button>
-              </Popconfirm>
-            </Space>
-          </template>
-        </BasicTable>
-        <RoomModal @reload="tableApi.query()" />
-      </Page>
+            </Popconfirm>
+          </Space>
+        </template>
+      </BasicTable>
     </div>
-  </div>
+    <RoomModal @reload="tableApi.query()" />
+  </Page>
 </template>

From 6935372fad8df7aa7b6f3cd0f801b2405afc8638 Mon Sep 17 00:00:00 2001
From: zcxlsm <patrickstarlsm@163.com>
Date: Thu, 4 Sep 2025 17:14:47 +0800
Subject: [PATCH 16/30] =?UTF-8?q?feat(electricEnergy):=20=E7=94=B5?=
 =?UTF-8?q?=E8=83=BD=E8=B6=8B=E5=8A=BF=E5=9B=BE=E8=A1=A8=E6=B7=BB=E5=8A=A0?=
 =?UTF-8?q?=E5=B9=B3=E5=9D=87=E5=80=BC=E6=A0=87=E8=AE=B0=E7=BA=BF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../electricEnergy/electricTrend/index.vue     | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)

diff --git a/apps/web-antd/src/views/property/energyManagement/electricEnergy/electricTrend/index.vue b/apps/web-antd/src/views/property/energyManagement/electricEnergy/electricTrend/index.vue
index 37d2ba4c..50fd77c2 100644
--- a/apps/web-antd/src/views/property/energyManagement/electricEnergy/electricTrend/index.vue
+++ b/apps/web-antd/src/views/property/energyManagement/electricEnergy/electricTrend/index.vue
@@ -266,6 +266,9 @@ async function handleSelectFloor(selectedKeys, info) {
               { type: 'min', name: 'Min' },
             ],
           },
+          markLine: {
+            data: [{ type: 'average', name: 'Avg' }],
+          },
         },
         {
           name: '当日',
@@ -277,6 +280,9 @@ async function handleSelectFloor(selectedKeys, info) {
               { type: 'min', name: 'Min' },
             ],
           },
+          markLine: {
+            data: [{ type: 'average', name: 'Avg' }],
+          },
         },
       ],
     });
@@ -297,6 +303,9 @@ async function handleSelectFloor(selectedKeys, info) {
               { type: 'min', name: 'Min' },
             ],
           },
+          markLine: {
+            data: [{ type: 'average', name: 'Avg' }],
+          },
         },
         {
           name: '当月',
@@ -308,6 +317,9 @@ async function handleSelectFloor(selectedKeys, info) {
               { type: 'min', name: 'Min' },
             ],
           },
+          markLine: {
+            data: [{ type: 'average', name: 'Avg' }],
+          },
         },
       ],
     });
@@ -328,6 +340,9 @@ async function handleSelectFloor(selectedKeys, info) {
               { type: 'min', name: 'Min' },
             ],
           },
+          markLine: {
+            data: [{ type: 'average', name: 'Avg' }],
+          },
         },
         {
           name: '当年',
@@ -339,6 +354,9 @@ async function handleSelectFloor(selectedKeys, info) {
               { type: 'min', name: 'Min' },
             ],
           },
+          markLine: {
+            data: [{ type: 'average', name: 'Avg' }],
+          },
         },
       ],
     });

From 5c4f2e6588b21b2ddef39f9ad008349f93a67702 Mon Sep 17 00:00:00 2001
From: zcxlsm <patrickstarlsm@163.com>
Date: Thu, 4 Sep 2025 17:16:01 +0800
Subject: [PATCH 17/30] build(web-antd): 1

---
 apps/web-antd/vite.config.mts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/apps/web-antd/vite.config.mts b/apps/web-antd/vite.config.mts
index ded7ff75..7e884500 100644
--- a/apps/web-antd/vite.config.mts
+++ b/apps/web-antd/vite.config.mts
@@ -27,7 +27,7 @@ export default defineConfig(async () => {
             changeOrigin: true,
             rewrite: (path) => path.replace(/^\/api/, ''),
             // mock代理目标地址
-            target: 'http://192.168.1.110:8080',
+            target: 'http://localhost:8080',
             ws: true,
           },
         },

From 724cb63fc8989a5f147beb064952db0f8874c271 Mon Sep 17 00:00:00 2001
From: FLL <2162874245@qq.com>
Date: Fri, 5 Sep 2025 14:20:28 +0800
Subject: [PATCH 18/30] feat

---
 .../visitorManagement/visitorInvitation/data.ts        | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/apps/web-antd/src/views/property/visitorManagement/visitorInvitation/data.ts b/apps/web-antd/src/views/property/visitorManagement/visitorInvitation/data.ts
index bd41b8cc..9d223ff3 100644
--- a/apps/web-antd/src/views/property/visitorManagement/visitorInvitation/data.ts
+++ b/apps/web-antd/src/views/property/visitorManagement/visitorInvitation/data.ts
@@ -2,7 +2,7 @@ import type { FormSchemaGetter } from '#/adapter/form';
 import type { VxeGridProps } from '#/adapter/vxe-table';
 import {getDictOptions} from "#/utils/dict";
 import {renderDict} from "#/utils/render";
-import {personList} from '#/api/property/resident/person'
+import {resident_unitList,} from '#/api/property/resident/unit';
 
 export const querySchema: FormSchemaGetter = () => [
   {
@@ -138,7 +138,7 @@ export const modalSchema: FormSchemaGetter = () => [
     rules: 'required',
   },
   {
-    label: '所属公司',
+    label: '所属单位',
     fieldName: 'visitorUnit',
     component: 'Input',
     rules: 'required',
@@ -160,10 +160,10 @@ export const modalSchema: FormSchemaGetter = () => [
     fieldName: 'interviewedUnit',
     component: 'ApiSelect',
     componentProps: {
-    api: personList,
+    api: resident_unitList,
       resultField: 'rows',
-      labelField: 'unitName',
-      valueField: 'unitName',
+      labelField: 'name',
+      valueField: 'name',
       placeholder: '请选择邀约单位',
     },
     rules: 'required',

From c4ff58e6f4d46d4d957e06b9e9afec422bd68f14 Mon Sep 17 00:00:00 2001
From: dev_ljl <2590379346@qq.com>
Date: Fri, 5 Sep 2025 14:27:16 +0800
Subject: [PATCH 19/30] =?UTF-8?q?feat:=E4=BC=9A=E8=AE=AE=E5=AE=A4=E8=AE=BE?=
 =?UTF-8?q?=E7=BD=AE=E6=B7=BB=E5=8A=A0=E4=BF=9D=E5=AF=86=E7=AD=89=E7=BA=A7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../roomBooking/conferenceSettings/model.d.ts | 14 ++++++++-----
 .../customerService/feedbacks/data.ts         | 13 ++++--------
 .../feedbacks/feedbacks-modal.vue             | 21 +++++++++++++++++++
 .../web-antd/src/views/property/floor/data.ts |  9 ++++----
 .../conferenceSettings-detail.vue             |  7 ++++++-
 .../roomBooking/conferenceSettings/data.ts    | 21 ++++++++++++++++++-
 6 files changed, 65 insertions(+), 20 deletions(-)

diff --git a/apps/web-antd/src/api/property/roomBooking/conferenceSettings/model.d.ts b/apps/web-antd/src/api/property/roomBooking/conferenceSettings/model.d.ts
index 11d1e48a..91d61285 100644
--- a/apps/web-antd/src/api/property/roomBooking/conferenceSettings/model.d.ts
+++ b/apps/web-antd/src/api/property/roomBooking/conferenceSettings/model.d.ts
@@ -1,4 +1,4 @@
-import type { PageQuery, BaseEntity } from '#/api/common';
+import type {PageQuery, BaseEntity} from '#/api/common';
 
 export interface MeetVO {
   /**
@@ -90,6 +90,10 @@ export interface MeetVO {
    *  负责人
    */
   principalsName: string;
+  /**
+   *  保密等级
+   */
+  secrecyGrade: string;
 }
 
 export interface MeetForm extends BaseEntity {
@@ -236,8 +240,8 @@ export interface MeetQuery extends PageQuery {
   searchValue?: string;
 
   /**
-    * 日期范围参数
-    */
+   * 日期范围参数
+   */
   params?: any;
 
   /**
@@ -274,7 +278,7 @@ export interface MeetQuery extends PageQuery {
   picture: string;
 }
 
-export interface ConferenceSettingsDetail{
+export interface ConferenceSettingsDetail {
   /**
    * 主键
    */
@@ -375,7 +379,7 @@ export interface ConferenceSettingsDetail{
 
 }
 
-export interface MeetBo{
+export interface MeetBo {
   /**
    * 会议室名称
    */
diff --git a/apps/web-antd/src/views/property/customerService/feedbacks/data.ts b/apps/web-antd/src/views/property/customerService/feedbacks/data.ts
index 498dafa9..a08554c2 100644
--- a/apps/web-antd/src/views/property/customerService/feedbacks/data.ts
+++ b/apps/web-antd/src/views/property/customerService/feedbacks/data.ts
@@ -63,11 +63,6 @@ export const columns: VxeGridProps['columns'] = [
     },
     width:120
   },
-  {
-    title: '客服电话',
-    field: 'serviceName',
-    width:120
-  },
   {
     field: 'action',
     fixed: 'right',
@@ -122,10 +117,10 @@ export const modalSchema: FormSchemaGetter = () => [
     },
   },
   {
-    label: '客服电话',
-    fieldName: 'serviceName',
-    component: 'Input',
-    rules: 'required',
+    label: '反馈单位',
+    fieldName: 'feedbackUnit',
+    component: 'Select',
+    rules: 'selectRequired',
   },
   {
     label: '反馈内容',
diff --git a/apps/web-antd/src/views/property/customerService/feedbacks/feedbacks-modal.vue b/apps/web-antd/src/views/property/customerService/feedbacks/feedbacks-modal.vue
index 431632c8..42250385 100644
--- a/apps/web-antd/src/views/property/customerService/feedbacks/feedbacks-modal.vue
+++ b/apps/web-antd/src/views/property/customerService/feedbacks/feedbacks-modal.vue
@@ -18,6 +18,7 @@ import type {FeedbacksVO} from "#/api/property/customerService/feedbacks/model";
 import {
   workOrdersTypeTree
 } from "#/api/property/businessManagement/workOrdersType";
+import {resident_unitList} from "#/api/property/resident/unit";
 
 const emit = defineEmits<{ reload: [] }>();
 
@@ -66,6 +67,7 @@ const [BasicModal, modalApi] = useVbenModal({
     const {id} = modalApi.getData() as { id?: number | string };
     isUpdate.value = !!id;
     await initWorkOrderTypeOption()
+    await initUnitOption()
     if (isUpdate.value && id) {
       const record = await feedbacksInfo(id);
       detail.value = record
@@ -127,6 +129,25 @@ async function initWorkOrderTypeOption() {
   ]);
 }
 
+async function initUnitOption() {
+  let params = {
+    pageSize: 1000,
+    pageNum: 1
+  }
+  const res = await resident_unitList(params)
+  formApi.updateSchema([{
+    componentProps: () => ({
+      options: res.rows,
+      //开启搜索
+      showSearch: true,
+      //数据过滤字段
+      optionFilterProp: 'name',
+      //下拉显示字段
+      fieldNames: {label: 'name', value: 'id'},
+    }),
+    fieldName: 'feedbackUnit',
+  }])
+}
 </script>
 
 <template>
diff --git a/apps/web-antd/src/views/property/floor/data.ts b/apps/web-antd/src/views/property/floor/data.ts
index aa09282a..4ed62e0e 100644
--- a/apps/web-antd/src/views/property/floor/data.ts
+++ b/apps/web-antd/src/views/property/floor/data.ts
@@ -5,7 +5,7 @@ export const querySchema: FormSchemaGetter = () => [
   {
     component: 'Input',
     fieldName: 'floorName',
-    label: '楼层名称',
+    label: '楼栋号',
   },
 ];
 
@@ -22,7 +22,7 @@ export const columns: VxeGridProps['columns'] = [
     field: 'buildingText',
   },
   {
-    title: '楼层名称',
+    title: '楼栋号',
     field: 'floorName',
   },
   {
@@ -76,11 +76,12 @@ export const modalSchema: FormSchemaGetter = () => [
     component: 'TreeSelect',
     fieldName: 'buildingId',
     defaultValue: undefined,
-    label: '社区建筑',
+    label: '建筑名称',
     rules: 'selectRequired',
+    formItemClass:'col-span-2',
   },
   {
-    label: '楼层数名称',
+    label: '楼栋号',
     fieldName: 'floorName',
     component: 'Input',
     rules: 'required',
diff --git a/apps/web-antd/src/views/property/roomBooking/conferenceSettings/conferenceSettings-detail.vue b/apps/web-antd/src/views/property/roomBooking/conferenceSettings/conferenceSettings-detail.vue
index 71a7e10d..37d9408c 100644
--- a/apps/web-antd/src/views/property/roomBooking/conferenceSettings/conferenceSettings-detail.vue
+++ b/apps/web-antd/src/views/property/roomBooking/conferenceSettings/conferenceSettings-detail.vue
@@ -54,10 +54,15 @@ async function handleOpenChange(open: boolean) {
         {{ conferenceSettingsDetail.name }}
       </DescriptionsItem>
       <DescriptionsItem label="会议室类型">
-        <component
+        <component v-if="conferenceSettingsDetail.meetingRoomType!=null"
           :is="renderDict(conferenceSettingsDetail.meetingRoomType,'meeting_room_type')"
         />
       </DescriptionsItem>
+      <DescriptionsItem label="保密等级">
+        <component v-if="conferenceSettingsDetail.secrecyGrade!=null"
+          :is="renderDict(conferenceSettingsDetail.secrecyGrade,'wy_hysbmdj')"
+        />
+      </DescriptionsItem>
       <DescriptionsItem label="可容纳人数">
         {{ conferenceSettingsDetail.personNumber }}
       </DescriptionsItem>
diff --git a/apps/web-antd/src/views/property/roomBooking/conferenceSettings/data.ts b/apps/web-antd/src/views/property/roomBooking/conferenceSettings/data.ts
index 866e5f5a..07ee9072 100644
--- a/apps/web-antd/src/views/property/roomBooking/conferenceSettings/data.ts
+++ b/apps/web-antd/src/views/property/roomBooking/conferenceSettings/data.ts
@@ -42,7 +42,16 @@ export const columns: VxeGridProps['columns'] = [
     field: 'meetingRoomType',
     slots: {
       default: ({row}) => {
-        return row.meetingRoomType!=null?renderDict(row.meetingRoomType, 'meeting_room_type'):'';
+        return row.meetingRoomType!=null?renderDict(row.meetingRoomType, 'meeting_room_type'):'-';
+      },
+    },
+    minWidth:100,
+  },
+  {
+    title: '保密等级',
+    slots: {
+      default: ({row}) => {
+        return row.secrecyGrade!=null?renderDict(row.secrecyGrade, 'wy_hysbmdj'):'-';
       },
     },
     minWidth:100,
@@ -124,6 +133,16 @@ export const modalSchema: FormSchemaGetter = () => [
     },
     rules: 'selectRequired',
   },
+  {
+    label: '保密等级',
+    fieldName: 'secrecyGrade',
+    component: 'Select',
+    componentProps: {
+      options: getDictOptions('wy_hysbmdj'),
+    },
+    rules: 'selectRequired',
+    formItemClass: 'col-span-1',
+  },
   {
     label: '可容纳人数',
     fieldName: 'personNumber',

From 6ee86ba7f9c00da6217a94819b8c359b1f3ac247 Mon Sep 17 00:00:00 2001
From: FLL <2162874245@qq.com>
Date: Fri, 5 Sep 2025 14:44:26 +0800
Subject: [PATCH 20/30] fix

---
 .../src/views/property/building/data.tsx      | 11 +++----
 .../src/views/property/community/data.ts      | 32 +++++++++----------
 .../web-antd/src/views/property/floor/data.ts | 15 ++++-----
 apps/web-antd/vite.config.mts                 |  2 +-
 4 files changed, 27 insertions(+), 33 deletions(-)

diff --git a/apps/web-antd/src/views/property/building/data.tsx b/apps/web-antd/src/views/property/building/data.tsx
index cd610bad..29691e90 100644
--- a/apps/web-antd/src/views/property/building/data.tsx
+++ b/apps/web-antd/src/views/property/building/data.tsx
@@ -45,14 +45,14 @@ export const querySchema: FormSchemaGetter = () => [
 // export const columns: () => VxeGridProps['columns'] = () => [
 export const columns: VxeGridProps['columns'] = [
   { type: 'checkbox', width: 60 },
-  {
-    title: '建筑名称',
-    field: 'buildingName',
-  },
   {
     title: '社区',
     field: 'communityText',
   },
+  {
+    title: '建筑',
+    field: 'buildingName',
+  },
   {
     title: '总层数',
     field: 'floorCount',
@@ -177,7 +177,6 @@ export const modalSchema: FormSchemaGetter = () => [
       min:0,
       precision:2,
     },
-    rules: 'required',
   },
   {
     label: '套内面积(㎡)',
@@ -187,7 +186,6 @@ export const modalSchema: FormSchemaGetter = () => [
       min:0,
       precision:2,
     },
-    rules: 'required',
   },
   {
     label: '公摊面积(㎡)',
@@ -197,6 +195,5 @@ export const modalSchema: FormSchemaGetter = () => [
       min:0,
       precision:2,
     },
-    rules: 'required',
   },
 ];
diff --git a/apps/web-antd/src/views/property/community/data.ts b/apps/web-antd/src/views/property/community/data.ts
index 7e2697eb..c7c7988d 100644
--- a/apps/web-antd/src/views/property/community/data.ts
+++ b/apps/web-antd/src/views/property/community/data.ts
@@ -13,7 +13,7 @@ export const querySchema: FormSchemaGetter = () => [
       options: getDictOptions(DictEnum.wy_sqlx),
     },
     fieldName: 'communityType',
-    label: '社区类型',
+    label: '园区类型',
   },
   {
     component: 'Input',
@@ -27,11 +27,11 @@ export const querySchema: FormSchemaGetter = () => [
 export const columns: VxeGridProps['columns'] = [
   {type: 'checkbox', width: 60},
   {
-    title: '社区名称',
+    title: '园区名称',
     field: 'communityName',
   },
   {
-    title: '社区类型',
+    title: '园区类型',
     field: 'communityType',
     slots: {
       default: ({row}) => {
@@ -72,7 +72,7 @@ export const columns: VxeGridProps['columns'] = [
     field: 'contactPhone',
   },
   {
-    title: '社区描述',
+    title: '园区描述',
     field: 'description',
   },
   {
@@ -95,21 +95,21 @@ export const modalSchema: FormSchemaGetter = () => [
     },
   },
   {
-    label: '社区名称',
+    label: '园区名称',
     fieldName: 'communityName',
     component: 'Input',
     rules: 'required',
   },
-  {
-    label: '社区类型',
-    fieldName: 'communityType',
-    component: 'Select',
-    componentProps: {
-      getPopupContainer,
-      options: getDictOptions(DictEnum.wy_sqlx),
-    },
-    rules: 'selectRequired',
-  },
+  // {
+  //   label: '园区类型',
+  //   fieldName: 'communityType',
+  //   component: 'Select',
+  //   componentProps: {
+  //     getPopupContainer,
+  //     options: getDictOptions(DictEnum.wy_sqlx),
+  //   },
+  //   rules: 'selectRequired',
+  // },
   {
     component: 'TreeSelect',
     fieldName: 'cityFullCode',
@@ -177,7 +177,7 @@ export const modalSchema: FormSchemaGetter = () => [
     component: 'Input',
   },
   {
-    label: '社区描述',
+    label: '园区描述',
     fieldName: 'description',
     component: 'Textarea',
   },
diff --git a/apps/web-antd/src/views/property/floor/data.ts b/apps/web-antd/src/views/property/floor/data.ts
index aa09282a..7c2c7ff4 100644
--- a/apps/web-antd/src/views/property/floor/data.ts
+++ b/apps/web-antd/src/views/property/floor/data.ts
@@ -85,12 +85,12 @@ export const modalSchema: FormSchemaGetter = () => [
     component: 'Input',
     rules: 'required',
   },
-  {
-    label: '楼层号',
-    fieldName: 'floorNumber',
-    component: 'Input',
-    rules: 'required',
-  },
+  // {
+  //   label: '楼层号',
+  //   fieldName: 'floorNumber',
+  //   component: 'Input',
+  //   rules: 'required',
+  // },
   /*{
     label: '楼层类型',
     fieldName: 'floorType',
@@ -123,7 +123,6 @@ export const modalSchema: FormSchemaGetter = () => [
       min:0,
       precision:2,
     },
-    rules: 'required',
   },
   {
     label: '套内面积(㎡)',
@@ -133,7 +132,6 @@ export const modalSchema: FormSchemaGetter = () => [
       min:0,
       precision:2,
     },
-    rules: 'required',
   },
   {
     label: '公摊面积(㎡)',
@@ -143,6 +141,5 @@ export const modalSchema: FormSchemaGetter = () => [
       min:0,
       precision:2,
     },
-    rules: 'required',
   },
 ];
diff --git a/apps/web-antd/vite.config.mts b/apps/web-antd/vite.config.mts
index 7e884500..ded7ff75 100644
--- a/apps/web-antd/vite.config.mts
+++ b/apps/web-antd/vite.config.mts
@@ -27,7 +27,7 @@ export default defineConfig(async () => {
             changeOrigin: true,
             rewrite: (path) => path.replace(/^\/api/, ''),
             // mock代理目标地址
-            target: 'http://localhost:8080',
+            target: 'http://192.168.1.110:8080',
             ws: true,
           },
         },

From 7848ae4acddd9d0c8870041cce30dfdb2ba26654 Mon Sep 17 00:00:00 2001
From: dev_ljl <2590379346@qq.com>
Date: Fri, 5 Sep 2025 15:13:22 +0800
Subject: [PATCH 21/30] =?UTF-8?q?feat:=E6=88=BF=E9=97=B4=E6=9F=A5=E8=AF=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/views/property/room/floor-tree.vue    | 13 +++---
 .../src/views/property/room/index.vue         | 45 ++++++++++++++-----
 2 files changed, 43 insertions(+), 15 deletions(-)

diff --git a/apps/web-antd/src/views/property/room/floor-tree.vue b/apps/web-antd/src/views/property/room/floor-tree.vue
index 75982f16..ad40f48d 100644
--- a/apps/web-antd/src/views/property/room/floor-tree.vue
+++ b/apps/web-antd/src/views/property/room/floor-tree.vue
@@ -21,8 +21,8 @@ const emit = defineEmits<{
   select: [];
 }>();
 
-const selectDeptId = defineModel('selectDeptId', {
-  required: true,
+const selectFloorId = defineModel('selectFloorId', {
+  default: '',
   type: Array as PropType<string[]>,
 });
 
@@ -40,7 +40,7 @@ const showTreeSkeleton = ref<boolean>(true);
 async function loadTree() {
   showTreeSkeleton.value = true;
   searchValue.value = '';
-  selectDeptId.value = [];
+  selectFloorId.value = [];
   const ret = await communityTree(3);
   deptTreeArray.value = ret;
   showTreeSkeleton.value = false;
@@ -50,6 +50,9 @@ async function handleReload() {
   await loadTree();
   emit('reload');
 }
+function selectNode(selectedKeys, e) {
+  emit('select',e.node.level);
+}
 
 onMounted(loadTree);
 </script>
@@ -86,14 +89,14 @@ onMounted(loadTree);
           <Tree
             v-bind="$attrs"
             v-if="deptTreeArray.length > 0"
-            v-model:selected-keys="selectDeptId"
+            v-model:selected-keys="selectFloorId"
             :class="$attrs.class"
             :field-names="{ title: 'label', key: 'id' }"
             :show-line="{ showLeafIcon: false }"
             :tree-data="deptTreeArray"
             :virtual="false"
             default-expand-all
-            @select="$emit('select')"
+            @select="selectNode"
           >
             <template #title="{ label }">
               <span v-if="label.indexOf(searchValue) > -1">
diff --git a/apps/web-antd/src/views/property/room/index.vue b/apps/web-antd/src/views/property/room/index.vue
index 6d62e994..52a70c86 100644
--- a/apps/web-antd/src/views/property/room/index.vue
+++ b/apps/web-antd/src/views/property/room/index.vue
@@ -1,7 +1,7 @@
 <script setup lang="ts">
-import { Page, useVbenModal, type VbenFormProps } from '@vben/common-ui';
-import { getVxePopupContainer } from '@vben/utils';
-import { Modal, Popconfirm, Space } from 'ant-design-vue';
+import {Page, useVbenModal, type VbenFormProps} from '@vben/common-ui';
+import {getVxePopupContainer} from '@vben/utils';
+import {Modal, Popconfirm, Space} from 'ant-design-vue';
 import FloorTree from "./floor-tree.vue"
 
 import {
@@ -15,11 +15,13 @@ import {
   roomList,
   roomRemove,
 } from '#/api/property/room';
-import type { RoomForm } from '#/api/property/room/model';
-import { commonDownloadExcel } from '#/utils/file/download';
+import type {RoomForm} from '#/api/property/room/model';
+import {commonDownloadExcel} from '#/utils/file/download';
 
 import roomModal from './room-modal.vue';
-import { columns, querySchema } from './data';
+import {columns, querySchema} from './data';
+import DeptTree from "#/views/system/user/dept-tree.vue";
+import {ref} from "vue";
 
 const formOptions: VbenFormProps = {
   commonConfig: {
@@ -58,7 +60,19 @@ const gridOptions: VxeGridProps = {
   pagerConfig: {},
   proxyConfig: {
     ajax: {
-      query: async ({ page }, formValues = {}) => {
+      query: async ({page}, formValues = {}) => {
+        Reflect.deleteProperty(formValues, 'communityId');
+        Reflect.deleteProperty(formValues, 'buildingId');
+        Reflect.deleteProperty(formValues, 'floorId');
+        if (selectFloorId.value.length === 1) {
+          if (level.value == 1) {
+            formValues.communityId = selectFloorId.value[0];
+          } else if (level.value == 2) {
+            formValues.buildingId = selectFloorId.value[0];
+          } else {
+            formValues.floorId = selectFloorId.value[0];
+          }
+        }
         return await roomList({
           pageNum: page.currentPage,
           pageSize: page.pageSize,
@@ -89,7 +103,7 @@ function handleAdd() {
 }
 
 async function handleEdit(row: Required<RoomForm>) {
-  modalApi.setData({ id: row.id });
+  modalApi.setData({id: row.id});
   modalApi.open();
 }
 
@@ -117,12 +131,23 @@ function handleDownloadExcel() {
     fieldMappingTime: formOptions.fieldMappingTime,
   });
 }
+
+const selectFloorId = ref<string[]>([]);
+const level = ref<number>();
+
+function handleSelectFloor(nodeLevel: number) {
+  level.value = nodeLevel;
+  tableApi.reload()
+}
 </script>
 
 <template>
   <Page :auto-content-height="true" style="width: 100%">
     <div class="flex h-full gap-[15px]">
-      <FloorTree></FloorTree>
+      <FloorTree v-model:select-floor-id="selectFloorId"
+                 class="w-[260px]"
+                 @reload="() => tableApi.reload()"
+                 @select="handleSelectFloor"></FloorTree>
       <BasicTable class="flex-1 overflow-hidden" table-title="房间信息列表">
         <template #toolbar-tools>
           <Space>
@@ -175,6 +200,6 @@ function handleDownloadExcel() {
         </template>
       </BasicTable>
     </div>
-    <RoomModal @reload="tableApi.query()" />
+    <RoomModal @reload="tableApi.query()"/>
   </Page>
 </template>

From 2a2b4a785017e4fdcb3eecf440a086f920d2b862 Mon Sep 17 00:00:00 2001
From: FLL <2162874245@qq.com>
Date: Fri, 5 Sep 2025 15:15:34 +0800
Subject: [PATCH 22/30] fix

---
 .../chargeManagement/data.ts                       |  2 +-
 .../chargeManagement/index.vue                     | 14 ++++++++++++++
 2 files changed, 15 insertions(+), 1 deletion(-)

diff --git a/apps/web-antd/src/views/property/greenPlantRentalManagement/chargeManagement/data.ts b/apps/web-antd/src/views/property/greenPlantRentalManagement/chargeManagement/data.ts
index 4348c2d0..da762957 100644
--- a/apps/web-antd/src/views/property/greenPlantRentalManagement/chargeManagement/data.ts
+++ b/apps/web-antd/src/views/property/greenPlantRentalManagement/chargeManagement/data.ts
@@ -162,7 +162,7 @@ export const columns: VxeGridProps['columns'] = [
     fixed: 'right',
     slots: { default: 'action' },
     title: '操作',
-    width: 180,
+    width: 240,
   },
 ];
 
diff --git a/apps/web-antd/src/views/property/greenPlantRentalManagement/chargeManagement/index.vue b/apps/web-antd/src/views/property/greenPlantRentalManagement/chargeManagement/index.vue
index 41bc1990..ce2d79ed 100644
--- a/apps/web-antd/src/views/property/greenPlantRentalManagement/chargeManagement/index.vue
+++ b/apps/web-antd/src/views/property/greenPlantRentalManagement/chargeManagement/index.vue
@@ -139,6 +139,20 @@ function handleMultiDelete() {
           >
             {{ $t('pages.common.edit') }}
           </ghost-button>
+          <Popconfirm
+            :get-popup-container="getVxePopupContainer"
+            placement="left"
+            title="确认退订吗？"
+            @confirm="handleDelete(row)"
+          >
+            <ghost-button
+              danger
+              v-access:code="['property:orderCharge:remove']"
+              @click.stop=""
+            >
+              {{ '退订' }}
+            </ghost-button>
+          </Popconfirm>
           <Popconfirm
             :get-popup-container="getVxePopupContainer"
             placement="left"

From 4ef34199b061ee58b0fea730c5bd83cbe2e8b62e Mon Sep 17 00:00:00 2001
From: dev_ljl <2590379346@qq.com>
Date: Fri, 5 Sep 2025 17:16:34 +0800
Subject: [PATCH 23/30] =?UTF-8?q?feat:=E6=88=BF=E9=97=B4=E8=AF=A6=E6=83=85?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../web-antd/src/api/property/room/model.d.ts | 35 ++++++++
 .../src/views/property/room/index.vue         | 17 +++-
 .../src/views/property/room/room-detail.vue   | 79 +++++++++++++++++++
 3 files changed, 130 insertions(+), 1 deletion(-)
 create mode 100644 apps/web-antd/src/views/property/room/room-detail.vue

diff --git a/apps/web-antd/src/api/property/room/model.d.ts b/apps/web-antd/src/api/property/room/model.d.ts
index cb62110d..13556d92 100644
--- a/apps/web-antd/src/api/property/room/model.d.ts
+++ b/apps/web-antd/src/api/property/room/model.d.ts
@@ -20,6 +20,7 @@ export interface RoomVO {
    * 房间类型('住宅','商铺','办公室','设备间','公共区域')
    */
   roomType: string;
+  roomTypeName: string;
 
   /**
    * 建筑面积(平方米)
@@ -50,6 +51,40 @@ export interface RoomVO {
    * 状态（'空置','已售','已租','自用'）
    */
   status: string;
+  /**
+   * 房间图片
+   */
+  imgUrl: string;
+  imgPath: string;
+
+
+  /**
+   * 是否重要
+   */
+  isMatter: string;
+  /**
+   * 状态
+   */
+  statusName: string;
+
+  /**
+   * 小区
+   */
+  communityText: string;
+
+  /**
+   * 建筑
+   */
+  buildingText: string;
+
+  /**
+   * 楼层
+   */
+  floorText: string;
+  /**
+   * 所属单位
+   */
+  residentUnitText: string;
 
 }
 
diff --git a/apps/web-antd/src/views/property/room/index.vue b/apps/web-antd/src/views/property/room/index.vue
index 52a70c86..e32e8bcf 100644
--- a/apps/web-antd/src/views/property/room/index.vue
+++ b/apps/web-antd/src/views/property/room/index.vue
@@ -3,6 +3,7 @@ import {Page, useVbenModal, type VbenFormProps} from '@vben/common-ui';
 import {getVxePopupContainer} from '@vben/utils';
 import {Modal, Popconfirm, Space} from 'ant-design-vue';
 import FloorTree from "./floor-tree.vue"
+import detailModal from "./room-detail.vue";
 
 import {
   useVbenVxeGrid,
@@ -20,7 +21,6 @@ import {commonDownloadExcel} from '#/utils/file/download';
 
 import roomModal from './room-modal.vue';
 import {columns, querySchema} from './data';
-import DeptTree from "#/views/system/user/dept-tree.vue";
 import {ref} from "vue";
 
 const formOptions: VbenFormProps = {
@@ -96,6 +96,9 @@ const [BasicTable, tableApi] = useVbenVxeGrid({
 const [RoomModal, modalApi] = useVbenModal({
   connectedComponent: roomModal,
 });
+const [RoomDetail, detailApi] = useVbenModal({
+  connectedComponent: detailModal,
+});
 
 function handleAdd() {
   modalApi.setData({});
@@ -107,6 +110,11 @@ async function handleEdit(row: Required<RoomForm>) {
   modalApi.open();
 }
 
+async function handleInfo(row: Required<RoomForm>) {
+  detailApi.setData({id: row.id});
+  detailApi.open();
+}
+
 async function handleDelete(row: Required<RoomForm>) {
   await roomRemove(row.id);
   await tableApi.query();
@@ -176,6 +184,12 @@ function handleSelectFloor(nodeLevel: number) {
         </template>
         <template #action="{ row }">
           <Space>
+            <ghost-button
+              v-access:code="['property:room:query']"
+              @click.stop="handleInfo(row)"
+            >
+              {{ $t('pages.common.info') }}
+            </ghost-button>
             <ghost-button
               v-access:code="['property:room:edit']"
               @click.stop="handleEdit(row)"
@@ -201,5 +215,6 @@ function handleSelectFloor(nodeLevel: number) {
       </BasicTable>
     </div>
     <RoomModal @reload="tableApi.query()"/>
+    <RoomDetail/>
   </Page>
 </template>
diff --git a/apps/web-antd/src/views/property/room/room-detail.vue b/apps/web-antd/src/views/property/room/room-detail.vue
new file mode 100644
index 00000000..e0c6ad09
--- /dev/null
+++ b/apps/web-antd/src/views/property/room/room-detail.vue
@@ -0,0 +1,79 @@
+<script setup lang="ts">
+import {shallowRef} from 'vue';
+import {useVbenModal} from '@vben/common-ui';
+import {Descriptions, DescriptionsItem} from 'ant-design-vue';
+import {ossInfo} from "#/api/system/oss";
+import {roomInfo} from "#/api/property/room";
+import type {RoomVO} from "#/api/property/room/model";
+import {renderDict} from "#/utils/render";
+
+const [BasicModal, modalApi] = useVbenModal({
+  onOpenChange: handleOpenChange,
+  onClosed() {
+    roomDetail.value = null;
+  },
+});
+
+const roomDetail = shallowRef<null | RoomVO>(null);
+
+async function handleOpenChange(open: boolean) {
+  if (!open) {
+    return null;
+  }
+  modalApi.modalLoading(true);
+  const {id} = modalApi.getData() as { id: number | string };
+  roomDetail.value = await roomInfo(id);
+  try {
+    if (roomDetail.value.imgUrl) {
+      const res = await ossInfo([roomDetail.value.imgUrl]);
+      roomDetail.value.imgPath = res?.[0]?.url
+    }
+  } catch (e) {}
+
+  modalApi.modalLoading(false);
+}
+</script>
+
+<template>
+  <BasicModal :footer="false" :fullscreen-button="false" title="房间详情" class="w-[70%]">
+    <Descriptions v-if="roomDetail" size="small" :column="2" bordered
+                  :labelStyle="{width:'120px'}">
+      <DescriptionsItem label="社区">
+        {{ roomDetail.communityText }}
+      </DescriptionsItem>
+      <DescriptionsItem label="建筑名称">
+        {{ roomDetail.buildingText }}
+      </DescriptionsItem>
+      <DescriptionsItem label="楼栋号">
+        {{ roomDetail.floorText }}
+      </DescriptionsItem>
+      <DescriptionsItem label="房间号">
+        {{ roomDetail.roomNumber }}
+      </DescriptionsItem>
+      <DescriptionsItem label="房间类型">
+        {{ roomDetail.roomTypeName }}
+      </DescriptionsItem>
+      <DescriptionsItem label="建筑面积">
+        {{ roomDetail.area }}
+      </DescriptionsItem>
+      <DescriptionsItem label="使用面积">
+        {{ roomDetail.insideInArea }}
+      </DescriptionsItem>
+
+      <DescriptionsItem label="是否重要">
+        <component v-if="roomDetail.isMatter != null"
+          :is="renderDict(roomDetail.isMatter,'wy_fjzydj')"
+        />
+      </DescriptionsItem>
+      <DescriptionsItem label="状态">
+        {{ roomDetail.statusName }}
+      </DescriptionsItem>
+      <DescriptionsItem label="所属单位">
+        {{ roomDetail.residentUnitText ? roomDetail.residentUnitText : '-'}}
+      </DescriptionsItem>
+      <DescriptionsItem label="房间图片" :span="2">
+        <img v-if="roomDetail.imgPath" :src="roomDetail.imgPath" alt="图片加载失败"  class="w-[100px] h-[100px]"/>
+      </DescriptionsItem>
+    </Descriptions>
+  </BasicModal>
+</template>

From 610f1e445f04ae051a4d2cfec0944b45cf7bf6e1 Mon Sep 17 00:00:00 2001
From: fyy <2717885210@qq.com>
Date: Fri, 5 Sep 2025 19:12:46 +0800
Subject: [PATCH 24/30] =?UTF-8?q?feat:=20=E9=A6=96=E9=A1=B5=E6=95=B0?=
 =?UTF-8?q?=E6=8D=AE=E5=AF=B9=E6=8E=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 apps/web-antd/src/api/analytics/index.ts      |  63 +++++
 .../dashboard/analytics/analytics-trends.vue  |  77 +++++--
 .../analytics/analytics-visits-data.vue       |  83 +++----
 .../src/views/dashboard/analytics/index.vue   | 217 +++++++++++++++---
 4 files changed, 340 insertions(+), 100 deletions(-)
 create mode 100644 apps/web-antd/src/api/analytics/index.ts

diff --git a/apps/web-antd/src/api/analytics/index.ts b/apps/web-antd/src/api/analytics/index.ts
new file mode 100644
index 00000000..38754d53
--- /dev/null
+++ b/apps/web-antd/src/api/analytics/index.ts
@@ -0,0 +1,63 @@
+import { requestClient } from '#/api/request';
+
+/**
+ * 查询工单数量
+ * @param params
+ * @returns 工单数量
+ */
+export function getIndexCount() {
+  return requestClient.get<any>('/property/index/indexCount');
+}
+
+// 今日预警分类统计
+export function getStatisticsCurrDay() {
+  return requestClient.get<any>('/sis/alarmEvents/query/statistics/currDay');
+}
+// 所有预警信息分类统计
+export function getStatistics() {
+  return requestClient.get<any>('/sis/alarmEvents/query/statistics');
+}
+// /**
+//  * 导出资产管理列表
+//  * @param params
+//  * @returns 资产管理列表
+//  */
+// export function assetExport(params?: AssetQuery) {
+//   return commonExport('/property/asset/export', params ?? {});
+// }
+
+// /**
+//  * 查询资产管理详情
+//  * @param id id
+//  * @returns 资产管理详情
+//  */
+// export function assetInfo(id: ID) {
+//   return requestClient.get<AssetVO>(`/property/asset/${id}`);
+// }
+
+// /**
+//  * 新增资产管理
+//  * @param data
+//  * @returns void
+//  */
+// export function assetAdd(data: AssetForm) {
+//   return requestClient.postWithMsg<void>('/property/asset', data);
+// }
+
+// /**
+//  * 更新资产管理
+//  * @param data
+//  * @returns void
+//  */
+// export function assetUpdate(data: AssetForm) {
+//   return requestClient.putWithMsg<void>('/property/asset', data);
+// }
+
+// /**
+//  * 删除资产管理
+//  * @param id id
+//  * @returns void
+//  */
+// export function assetRemove(id: ID | IDS) {
+//   return requestClient.deleteWithMsg<void>(`/property/asset/${id}`);
+// }
diff --git a/apps/web-antd/src/views/dashboard/analytics/analytics-trends.vue b/apps/web-antd/src/views/dashboard/analytics/analytics-trends.vue
index 9bd90fc8..0114fe95 100644
--- a/apps/web-antd/src/views/dashboard/analytics/analytics-trends.vue
+++ b/apps/web-antd/src/views/dashboard/analytics/analytics-trends.vue
@@ -3,11 +3,56 @@ import type { EchartsUIType } from '@vben/plugins/echarts';
 
 import { EchartsUI, useEcharts } from '@vben/plugins/echarts';
 import { onMounted, ref } from 'vue';
+import { meterRecordTrend } from '#/api/property/energyManagement/meterRecord';
+import dayjs from 'dayjs';
 
 const chartRef = ref<EchartsUIType>();
 const { renderEcharts } = useEcharts(chartRef);
+// 添加日期选择相关逻辑
+const selectedDate = ref<string>(dayjs().format('YYYY-MM'));
+// 获取当月天数
+const getDaysInMonth = (date: string) => {
+  const year = parseInt(date.split('-')[0]);
+  const month = parseInt(date.split('-')[1]);
+  const daysInMonth = new Date(year, month, 0).getDate();
+  return Array.from({ length: daysInMonth }, (_, i) => i + 1);
+};
 
-onMounted(() => {
+const handleDateChange = () => {
+  console.log('selectedDate', selectedDate.value);
+
+  getMeterRecordTrend();
+};
+const getMeterRecordTrend = async () => {
+      const res = await meterRecordTrend(
+    {
+       day: dayjs().format('YYYY-MM-DD'),
+    month: selectedDate.value || dayjs().format('YYYY-MM'),
+    year: dayjs().format('YYYY'),
+    meterType: 1,
+    meterId: null,
+    floorId: null,
+  }
+  );
+console.log(res);
+
+  // 处理返回的数据
+  const chartData = res.day.nowMonth.data || [];
+console.log(chartData);
+
+  // 创建一个映射，将日期和数值对应起来
+  const dataMap: Record<string, string> = {};
+  chartData.forEach(([day, value]: [string, string]) => {
+    dataMap[day] = value;
+  });
+
+  // 获取当月所有日期
+  const days = getDaysInMonth(selectedDate.value);
+
+  // 为没有数据的日期填充0，构建完整的数据数组
+  const seriesData = days.map(day => {
+    return parseFloat(dataMap[day.toString()] || '0');
+  });
   renderEcharts({
     grid: {
       bottom: 0,
@@ -19,29 +64,13 @@ onMounted(() => {
     series: [
       {
         areaStyle: {},
-        data: [
-          111, 2000, 6000, 16_000, 33_333, 55_555, 64_000, 33_333, 18_000,
-          36_000, 70_000, 42_444, 23_222, 13_000, 8000, 4000, 1200, 333, 222,
-          111,
-        ],
+        data: seriesData,
         itemStyle: {
           color: '#5ab1ef',
         },
         smooth: true,
         type: 'line',
-      },
-      {
-        areaStyle: {},
-        data: [
-          33, 66, 88, 333, 3333, 6200, 20_000, 3000, 1200, 13_000, 22_000,
-          11_000, 2221, 1201, 390, 198, 60, 30, 22, 11,
-        ],
-        itemStyle: {
-          color: '#019680',
-        },
-        smooth: true,
-        type: 'line',
-      },
+      }
     ],
     tooltip: {
       axisPointer: {
@@ -65,7 +94,7 @@ onMounted(() => {
         show: false,
       },
       boundaryGap: false,
-      data: Array.from({ length: 18 }).map((_item, index) => `${index + 6}:00`),
+      data: days,
       splitLine: {
         lineStyle: {
           type: 'solid',
@@ -80,7 +109,7 @@ onMounted(() => {
         axisTick: {
           show: false,
         },
-        max: 80_000,
+        // max: 800,
         splitArea: {
           show: true,
         },
@@ -89,9 +118,15 @@ onMounted(() => {
       },
     ],
   });
+};
+onMounted(async () => {
+getMeterRecordTrend();
 });
+
 </script>
 
 <template>
+  <div>
   <EchartsUI ref="chartRef" />
+  </div>
 </template>
diff --git a/apps/web-antd/src/views/dashboard/analytics/analytics-visits-data.vue b/apps/web-antd/src/views/dashboard/analytics/analytics-visits-data.vue
index 651abbc1..c993f834 100644
--- a/apps/web-antd/src/views/dashboard/analytics/analytics-visits-data.vue
+++ b/apps/web-antd/src/views/dashboard/analytics/analytics-visits-data.vue
@@ -10,68 +10,45 @@ const { renderEcharts } = useEcharts(chartRef);
 onMounted(() => {
   renderEcharts({
     legend: {
-      bottom: 0,
-      data: ['访问', '趋势'],
-    },
-    radar: {
-      indicator: [
-        {
-          name: '网页',
-        },
-        {
-          name: '移动端',
-        },
-        {
-          name: 'Ipad',
-        },
-        {
-          name: '客户端',
-        },
-        {
-          name: '第三方',
-        },
-        {
-          name: '其它',
-        },
-      ],
-      radius: '60%',
-      splitNumber: 8,
+      bottom: '2%',
+      left: 'center',
     },
     series: [
       {
-        areaStyle: {
-          opacity: 1,
-          shadowBlur: 0,
-          shadowColor: 'rgba(0,0,0,.2)',
-          shadowOffsetX: 0,
-          shadowOffsetY: 10,
+        animationDelay() {
+          return Math.random() * 100;
         },
+        animationEasing: 'exponentialInOut',
+        animationType: 'scale',
+        avoidLabelOverlap: false,
+        color: ['#5ab1ef', '#b6a2de', '#67e0e3', '#2ec7c9'],
         data: [
-          {
-            itemStyle: {
-              color: '#b6a2de',
-            },
-            name: '访问',
-            value: [90, 50, 86, 40, 50, 20],
-          },
-          {
-            itemStyle: {
-              color: '#5ab1ef',
-            },
-            name: '趋势',
-            value: [70, 75, 70, 76, 20, 85],
-          },
+          { name: '搜索引擎', value: 1048 },
+          { name: '直接访问', value: 735 },
+          { name: '邮件营销', value: 580 },
+          // { name: '联盟广告', value: 484 },
         ],
-        itemStyle: {
-          // borderColor: '#fff',
-          borderRadius: 10,
-          borderWidth: 2,
+        emphasis: {
+          label: {
+            fontSize: '12',
+            fontWeight: 'bold',
+            show: true,
+          },
         },
-        symbolSize: 0,
-        type: 'radar',
+        label: {
+          position: 'center',
+          show: false,
+        },
+        labelLine: {
+          show: false,
+        },
+        name: '访问来源',
+        type: 'pie',
       },
     ],
-    tooltip: {},
+    tooltip: {
+      trigger: 'item',
+    },
   });
 });
 </script>
diff --git a/apps/web-antd/src/views/dashboard/analytics/index.vue b/apps/web-antd/src/views/dashboard/analytics/index.vue
index 0236c92a..1f639b2a 100644
--- a/apps/web-antd/src/views/dashboard/analytics/index.vue
+++ b/apps/web-antd/src/views/dashboard/analytics/index.vue
@@ -19,70 +19,235 @@ import AnalyticsVisitsData from './analytics-visits-data.vue';
 import AnalyticsVisitsSales from './analytics-visits-sales.vue';
 import AnalyticsVisitsSource from './analytics-visits-source.vue';
 import AnalyticsVisits from './analytics-visits.vue';
-
-const overviewItems: AnalysisOverviewItem[] = [
+import { ref,onMounted } from 'vue';
+import { DatePicker } from 'ant-design-vue';
+import { Button, Radio } from 'ant-design-vue';
+import type { RadioChangeEvent } from 'ant-design-vue';
+import {getIndexCount,getStatisticsCurrDay,getStatistics} from '#/api/analytics/index.ts';
+const overviewItems =ref<AnalysisOverviewItem[]>(
+  [
   {
     icon: SvgCardIcon,
-    title: '用户量',
-    totalTitle: '总用户量',
+    title: '今日访客量',
+    totalTitle: '总访客量',
     totalValue: 78,
     value: 15,
   },
   {
     icon: SvgCakeIcon,
-    title: '访问量',
-    totalTitle: '总访问量',
-    totalValue: 2_278,
-    value: 461,
+    title: '今日车流量',
+    totalTitle: '总车流量',
+    totalValue: 0,
+    value: 0,
   },
   {
     icon: SvgDownloadIcon,
-    title: '下载量',
-    totalTitle: '总下载量',
+    title: '今日预警数量',
+    totalTitle: '总预警量',
     totalValue: 17,
     value: 2,
   },
   {
     icon: SvgBellIcon,
-    title: '使用量',
-    totalTitle: '总使用量',
-    totalValue: 6_652,
-    value: 3_739,
+    title: '今日工单数量',
+    totalTitle: '总工单量',
+    totalValue: 0,
+    value: 0,
   },
-];
+]
+);
 
 const chartTabs: TabOption[] = [
   {
-    label: '流量趋势',
+    label: '电量',
     value: 'trends',
   },
-  {
-    label: '月访问量',
-    value: 'visits',
-  },
+  // {
+  //   label: '水量',
+  //   value: 'visits',
+  // },
 ];
+//tab选择
+const timeUnit = ref(1);
+// 月份选择
+const selectedDate = ref('');
+const handleDateChange = (date: string) => {
+  selectedDate.value = date;
+  // 在这里可以添加根据选择日期筛选数据的逻辑
+  console.log('选择的日期:', date);
+};
+
+// 工单数量
+const indexCount = ref(0);
+async function getIndex() {
+  console.log(123);
+
+  const res = await getIndexCount();
+    console.log(res);
+    // overviewItems[3].value = res.workOrdersToday
+    // overviewItems[3].totalValue = res.workOrdersTotald
+    console.log(overviewItems);
+
+}
+// 车流量
+async function getCarCount() {
+    const startDate = new Date();
+  startDate.setHours(0, 0, 0, 0);
+  const endDate = new Date();
+  endDate.setHours(23, 59, 59, 999);
+  // 转换为正确的 ISO 格式，考虑时区偏移
+  const toLocalISOString = (date: Date) => {
+    const timezoneOffset = date.getTimezoneOffset() * 60000; // 转换为毫秒
+    const localTime = new Date(date.getTime() - timezoneOffset);
+    return localTime.toISOString().slice(0, -1) + 'Z';
+  };
+            const response = await fetch(
+              'https://server.cqnctc.com:6081/web/lot/net/queryOrderParkForPage',
+              {
+                method: 'POST',
+                headers: {
+                  'X-Auth-Token': `${sessionStorage.getItem('token')}`,
+                  'Content-Type': 'application/json',
+                  Authorization: `Bearer ${sessionStorage.getItem('token')}`,
+                  Accept: 'application/json, text/plain, */*',
+                },
+                body: JSON.stringify({
+    pageReq: {
+        pageNum: 1,
+        pageSize: 10
+    },
+    plNos: [
+        "PFN000000012",
+"PFN000000022",
+        "PFN000000025"
+    ],
+    parkInBeginTime: toLocalISOString(startDate),
+    parkInEndTime: toLocalISOString(endDate),
+    orgId: 10012,
+    parkOrderTypes: [
+        100,
+        200,
+        201,
+        300,
+        500
+    ],
+    terminalSource: 50,
+    remark: ""
+}),
+              },
+            );
+            const result = await response.json();
+overviewItems.value[1].value = result.data.pageTotals;
+            const response2 = await fetch(
+              'https://server.cqnctc.com:6081/web/lot/net/queryOrderParkForPage',
+              {
+                method: 'POST',
+                headers: {
+                  'X-Auth-Token': `${sessionStorage.getItem('token')}`,
+                  'Content-Type': 'application/json',
+                  Authorization: `Bearer ${sessionStorage.getItem('token')}`,
+                  Accept: 'application/json, text/plain, */*',
+                },
+                body: JSON.stringify({
+    pageReq: {
+        pageNum: 1,
+        pageSize: 10
+    },
+    plNos: [
+        "PFN000000012",
+"PFN000000022",
+        "PFN000000025"
+    ],
+    parkInBeginTime: "",
+    parkInEndTime: "",
+    orgId: 10012,
+    parkOrderTypes: [
+        100,
+        200,
+        201,
+        300,
+        500
+    ],
+    terminalSource: 50,
+    remark: ""
+}),
+              },
+            );
+            const result2 = await response2.json();
+            overviewItems.value[1].totalValue = result2.data.pageTotals;
+
+
+
+}
+// 预警
+async function getStatisticsCurrDayCount() {
+  const res  = await getStatisticsCurrDay();
+  console.log(res);
+}
+async function getStatisticsCount() {
+  const res  = await getStatistics();
+  console.log(res);
+}
+// 电量
+
+onMounted(() => {
+   getIndex();
+   getCarCount();
+   getStatisticsCurrDayCount();
+   getStatisticsCount();
+})
+
 </script>
 
 <template>
   <div class="p-5">
     <AnalysisOverview :items="overviewItems" />
-    <AnalysisChartsTabs :tabs="chartTabs" class="mt-5">
+    <!-- <AnalysisChartsTabs :tabs="chartTabs" class="mt-5">
       <template #trends>
         <AnalyticsTrends />
       </template>
       <template #visits>
         <AnalyticsVisits />
       </template>
-    </AnalysisChartsTabs>
-
+    </AnalysisChartsTabs> -->
+    <div class="mt-5 bg-white rounded-lg">
+      <div
+        class="p-5 flex items-center justify-between "
+        style="
+          width: 100%;
+          height: 100px;
+        "
+      >
+        <Radio.Group
+          v-model:value="timeUnit"
+          @change="handleViewModeChange"
+          size="large"
+        >
+          <Radio.Button value="1">电量</Radio.Button>
+        </Radio.Group>
+        <DatePicker
+          v-model:value="selectedDate"
+          picker="month"
+          placeholder="请选择月份"
+          style="width: 150px"
+          @change="handleDateChange"
+        />
+      </div>
+      <div v-if="timeUnit == 1">
+        <AnalyticsTrends />
+      </div>
+    </div>
     <div class="mt-5 w-full md:flex">
-      <AnalysisChartCard class="mt-5 md:mr-4 md:mt-0 md:w-1/3" title="访问数量">
+      <AnalysisChartCard class="mt-5 md:mr-4 md:mt-0 md:w-1/3" title="预警类型">
         <AnalyticsVisitsData />
       </AnalysisChartCard>
-      <AnalysisChartCard class="mt-5 md:mr-4 md:mt-0 md:w-1/3" title="访问来源">
+      <AnalysisChartCard
+        class="mt-5 md:mr-4 md:mt-0 md:w-1/3"
+        title="设备使用状态"
+      >
         <AnalyticsVisitsSource />
       </AnalysisChartCard>
-      <AnalysisChartCard class="mt-5 md:mt-0 md:w-1/3" title="访问来源">
+      <AnalysisChartCard class="mt-5 md:mt-0 md:w-1/3" title="工单类型">
         <AnalyticsVisitsSales />
       </AnalysisChartCard>
     </div>

From 9bd24de45802c24ee59be65f21ed80fb8e4febec Mon Sep 17 00:00:00 2001
From: fyy <2717885210@qq.com>
Date: Fri, 5 Sep 2025 19:13:41 +0800
Subject: [PATCH 25/30] =?UTF-8?q?feat:=20=E9=A6=96=E9=A1=B5=E6=95=B0?=
 =?UTF-8?q?=E6=8D=AE=E5=AF=B9=E6=8E=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 apps/web-antd/vite.config.mts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/apps/web-antd/vite.config.mts b/apps/web-antd/vite.config.mts
index ded7ff75..7e884500 100644
--- a/apps/web-antd/vite.config.mts
+++ b/apps/web-antd/vite.config.mts
@@ -27,7 +27,7 @@ export default defineConfig(async () => {
             changeOrigin: true,
             rewrite: (path) => path.replace(/^\/api/, ''),
             // mock代理目标地址
-            target: 'http://192.168.1.110:8080',
+            target: 'http://localhost:8080',
             ws: true,
           },
         },

From 6f987f29ef61c1e888084da2409768e8ad7ca36b Mon Sep 17 00:00:00 2001
From: fyy <2717885210@qq.com>
Date: Sat, 6 Sep 2025 00:49:44 +0800
Subject: [PATCH 26/30] =?UTF-8?q?feat:=20=E9=A6=96=E9=A1=B5=E6=95=B0?=
 =?UTF-8?q?=E6=8D=AE=E5=AF=B9=E6=8E=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../energyManagement/meterRecord/index.ts     |  24 +-
 .../energyManagement/meterRecord/model.d.ts   |  81 +++---
 .../dashboard/analytics/analytics-trends.vue  |  38 +--
 .../analytics/analytics-visits-data.vue       |  43 ++-
 .../analytics/analytics-visits-sales.vue      |  44 ++-
 .../analytics/analytics-visits-source.vue     |  50 +++-
 .../src/views/dashboard/analytics/index.vue   | 265 ++++++++----------
 .../src/views/property/building/data.tsx      |  50 ++--
 .../src/views/property/community/data.ts      |  55 ++--
 .../web-antd/src/views/property/floor/data.ts |  54 ++--
 apps/web-antd/src/views/property/room/data.ts |  33 +--
 11 files changed, 388 insertions(+), 349 deletions(-)

diff --git a/apps/web-antd/src/api/property/energyManagement/meterRecord/index.ts b/apps/web-antd/src/api/property/energyManagement/meterRecord/index.ts
index a9465c99..e0db5b01 100644
--- a/apps/web-antd/src/api/property/energyManagement/meterRecord/index.ts
+++ b/apps/web-antd/src/api/property/energyManagement/meterRecord/index.ts
@@ -1,4 +1,9 @@
-import type { MeterRecordVO, MeterRecordForm, MeterRecordQuery, MeterRecordTrend } from './model';
+import type {
+  MeterRecordVO,
+  MeterRecordForm,
+  MeterRecordQuery,
+  MeterRecordTrend,
+} from './model';
 
 import type { ID, IDS } from '#/api/common';
 import type { PageResult } from '#/api/common';
@@ -7,12 +12,15 @@ import { commonExport } from '#/api/helper';
 import { requestClient } from '#/api/request';
 
 /**
-* 查询抄表记录列表
-* @param params
-* @returns 抄表记录列表
-*/
+ * 查询抄表记录列表
+ * @param params
+ * @returns 抄表记录列表
+ */
 export function meterRecordList(params?: MeterRecordQuery) {
-  return requestClient.get<PageResult<MeterRecordVO>>('/property/meterRecord/list', { params });
+  return requestClient.get<PageResult<MeterRecordVO>>(
+    '/property/meterRecord/list',
+    { params },
+  );
 }
 
 /**
@@ -62,10 +70,10 @@ export function meterRecordRemove(id: ID | IDS) {
 
 /**
  * 获取用电/气/水趋势分析数据
- * 
+ *
  * @param params
  * @returns 用电/气/水趋势分析数据
  */
 export function meterRecordTrend(params: MeterRecordTrend) {
-  return requestClient.get<void>('/property/meterRecord/trend', { params });
+  return requestClient.get<any>('/property/meterRecord/trend', { params });
 }
diff --git a/apps/web-antd/src/api/property/energyManagement/meterRecord/model.d.ts b/apps/web-antd/src/api/property/energyManagement/meterRecord/model.d.ts
index a5d60084..de68f989 100644
--- a/apps/web-antd/src/api/property/energyManagement/meterRecord/model.d.ts
+++ b/apps/web-antd/src/api/property/energyManagement/meterRecord/model.d.ts
@@ -1,182 +1,179 @@
-import type { PageQuery, BaseEntity } from '#/api/common'
+import type { PageQuery, BaseEntity } from '#/api/common';
 
 export interface MeterRecordVO {
   /**
    * 记录ID
    */
-  id: string | number
+  id: string | number;
 
   /**
    * 仪表编号
    */
-  meterId: string | number
+  meterId: string | number;
 
   /**
-  * 仪表类型
-  */
-  meterType: string | number
+   * 仪表类型
+   */
+  meterType: string | number;
 
   /**
    * 抄表员ID
    */
-  readerId: string | number
+  readerId: string | number;
 
   /**
    * 抄表时间
    */
-  readingTime: string
+  readingTime: string;
 
   /**
    * 当前读数
    */
-  currentReading: number
+  currentReading: number;
 
   /**
    * 上次读数
    */
-  previousReading: number
+  previousReading: number;
 
   /**
    * 用量
    */
-  consumption: number
+  consumption: number;
 
   /**
    * 抄表方式(1手动 2自动 3用户上报)
    */
-  readingMethod: number
+  readingMethod: number;
 
   /**
    * 抄表照片
    */
-  imgOssid: string | number
-
+  imgOssid: string | number;
 }
 
 export interface MeterRecordForm extends BaseEntity {
   /**
    * 记录ID
    */
-  id?: string | number
+  id?: string | number;
 
   /**
    * 仪表编号
    */
-  meterId?: string | number
+  meterId?: string | number;
 
   /**
    * 抄表员ID
    */
-  readerId?: string | number
+  readerId?: string | number;
 
   /**
    * 抄表时间
    */
-  readingTime?: string
+  readingTime?: string;
 
   /**
    * 当前读数
    */
-  currentReading?: number
+  currentReading?: number;
 
   /**
    * 上次读数
    */
-  previousReading?: number
+  previousReading?: number;
 
   /**
    * 用量
    */
-  consumption?: number
+  consumption?: number;
 
   /**
    * 抄表方式(1手动 2自动 3用户上报)
    */
-  readingMethod?: number
+  readingMethod?: number;
 
   /**
    * 抄表照片
    */
-  imgOssid?: string | number
-
+  imgOssid?: string | number;
 }
 
 export interface MeterRecordQuery extends PageQuery {
   /**
    * 仪表编号
    */
-  meterId?: string | number
+  meterId?: string | number;
 
   /**
    * 抄表员ID
    */
-  readerId?: string | number
+  readerId?: string | number;
 
   /**
    * 抄表时间
    */
-  readingTime?: string
+  readingTime?: string;
 
   /**
    * 当前读数
    */
-  currentReading?: number
+  currentReading?: number;
 
   /**
    * 上次读数
    */
-  previousReading?: number
+  previousReading?: number;
 
   /**
    * 用量
    */
-  consumption?: number
+  consumption?: number;
 
   /**
    * 抄表方式(1手动 2自动 3用户上报)
    */
-  readingMethod?: number
+  readingMethod?: number;
 
   /**
    * 抄表照片
    */
-  imgOssid?: string | number
+  imgOssid?: string | number;
 
   /**
-    * 日期范围参数
-    */
-  params?: any
+   * 日期范围参数
+   */
+  params?: any;
 }
 
-
 export interface MeterRecordTrend {
   /**
    * 仪表类型
    */
-  meterType?: string | number
+  meterType?: string | number;
 
   /**
    * 仪表ID
    */
-  meterId: string | number
+  meterId: any;
 
   /**
    * 楼层ID
    */
-  floorId: string | number
+  floorId: any;
 
   /**
    * 日期
    */
-  day?: string
+  day?: string;
 
   /**
    * 月份
    */
-  month?: string
+  month?: string;
 
   /**
    * 年份
    */
-  year?: string
+  year?: string;
 }
diff --git a/apps/web-antd/src/views/dashboard/analytics/analytics-trends.vue b/apps/web-antd/src/views/dashboard/analytics/analytics-trends.vue
index 0114fe95..353d4c96 100644
--- a/apps/web-antd/src/views/dashboard/analytics/analytics-trends.vue
+++ b/apps/web-antd/src/views/dashboard/analytics/analytics-trends.vue
@@ -2,43 +2,32 @@
 import type { EchartsUIType } from '@vben/plugins/echarts';
 
 import { EchartsUI, useEcharts } from '@vben/plugins/echarts';
-import { onMounted, ref } from 'vue';
+import { onMounted, ref, defineExpose } from 'vue';
 import { meterRecordTrend } from '#/api/property/energyManagement/meterRecord';
 import dayjs from 'dayjs';
-
 const chartRef = ref<EchartsUIType>();
 const { renderEcharts } = useEcharts(chartRef);
 // 添加日期选择相关逻辑
 const selectedDate = ref<string>(dayjs().format('YYYY-MM'));
 // 获取当月天数
-const getDaysInMonth = (date: string) => {
+const getDaysInMonth = (date: any) => {
   const year = parseInt(date.split('-')[0]);
   const month = parseInt(date.split('-')[1]);
   const daysInMonth = new Date(year, month, 0).getDate();
   return Array.from({ length: daysInMonth }, (_, i) => i + 1);
 };
-
-const handleDateChange = () => {
-  console.log('selectedDate', selectedDate.value);
-
-  getMeterRecordTrend();
-};
-const getMeterRecordTrend = async () => {
-      const res = await meterRecordTrend(
-    {
-       day: dayjs().format('YYYY-MM-DD'),
-    month: selectedDate.value || dayjs().format('YYYY-MM'),
+const getMeterRecordTrend = async (selectedDate: any) => {
+  const res = await meterRecordTrend({
+    day: dayjs().format('YYYY-MM-DD'),
+    month: selectedDate.value,
     year: dayjs().format('YYYY'),
     meterType: 1,
     meterId: null,
     floorId: null,
-  }
-  );
-console.log(res);
+  });
 
   // 处理返回的数据
   const chartData = res.day.nowMonth.data || [];
-console.log(chartData);
 
   // 创建一个映射，将日期和数值对应起来
   const dataMap: Record<string, string> = {};
@@ -50,7 +39,7 @@ console.log(chartData);
   const days = getDaysInMonth(selectedDate.value);
 
   // 为没有数据的日期填充0，构建完整的数据数组
-  const seriesData = days.map(day => {
+  const seriesData = days.map((day) => {
     return parseFloat(dataMap[day.toString()] || '0');
   });
   renderEcharts({
@@ -70,7 +59,7 @@ console.log(chartData);
         },
         smooth: true,
         type: 'line',
-      }
+      },
     ],
     tooltip: {
       axisPointer: {
@@ -120,13 +109,16 @@ console.log(chartData);
   });
 };
 onMounted(async () => {
-getMeterRecordTrend();
+  getMeterRecordTrend(selectedDate);
+});
+// 暴露方法给父组件调用
+defineExpose({
+  getMeterRecordTrend,
 });
-
 </script>
 
 <template>
   <div>
-  <EchartsUI ref="chartRef" />
+    <EchartsUI ref="chartRef" />
   </div>
 </template>
diff --git a/apps/web-antd/src/views/dashboard/analytics/analytics-visits-data.vue b/apps/web-antd/src/views/dashboard/analytics/analytics-visits-data.vue
index c993f834..e61485e9 100644
--- a/apps/web-antd/src/views/dashboard/analytics/analytics-visits-data.vue
+++ b/apps/web-antd/src/views/dashboard/analytics/analytics-visits-data.vue
@@ -2,12 +2,35 @@
 import type { EchartsUIType } from '@vben/plugins/echarts';
 
 import { EchartsUI, useEcharts } from '@vben/plugins/echarts';
-import { onMounted, ref } from 'vue';
+import { watch, onMounted, ref, defineProps, computed } from 'vue';
 
 const chartRef = ref<EchartsUIType>();
 const { renderEcharts } = useEcharts(chartRef);
+const props = defineProps<{
+  statisticsData?: any[]; // 根据实际数据结构调整类型
+}>();
+// 在组件顶层定义 computed 属性
+const chartData = computed(() => {
+  if (!props.statisticsData) return [];
+  return props.statisticsData.map((item) => ({
+    name: item.typeName,
+    value: item.total,
+  }));
+});
 
-onMounted(() => {
+// 监听数据变化，重新渲染图表
+watch(
+  () => props.statisticsData,
+  (newData) => {
+    if (newData) {
+      updateChart();
+    }
+  },
+  { immediate: true },
+);
+
+// 封装图表更新逻辑
+const updateChart = () => {
   renderEcharts({
     legend: {
       bottom: '2%',
@@ -22,12 +45,7 @@ onMounted(() => {
         animationType: 'scale',
         avoidLabelOverlap: false,
         color: ['#5ab1ef', '#b6a2de', '#67e0e3', '#2ec7c9'],
-        data: [
-          { name: '搜索引擎', value: 1048 },
-          { name: '直接访问', value: 735 },
-          { name: '邮件营销', value: 580 },
-          // { name: '联盟广告', value: 484 },
-        ],
+        data: chartData.value,
         emphasis: {
           label: {
             fontSize: '12',
@@ -42,7 +60,7 @@ onMounted(() => {
         labelLine: {
           show: false,
         },
-        name: '访问来源',
+        name: '预警类型',
         type: 'pie',
       },
     ],
@@ -50,6 +68,13 @@ onMounted(() => {
       trigger: 'item',
     },
   });
+};
+
+onMounted(() => {
+  // 组件挂载时尝试更新图表
+  if (props.statisticsData) {
+    updateChart();
+  }
 });
 </script>
 
diff --git a/apps/web-antd/src/views/dashboard/analytics/analytics-visits-sales.vue b/apps/web-antd/src/views/dashboard/analytics/analytics-visits-sales.vue
index f38b5c03..b333bb2b 100644
--- a/apps/web-antd/src/views/dashboard/analytics/analytics-visits-sales.vue
+++ b/apps/web-antd/src/views/dashboard/analytics/analytics-visits-sales.vue
@@ -2,12 +2,34 @@
 import type { EchartsUIType } from '@vben/plugins/echarts';
 
 import { EchartsUI, useEcharts } from '@vben/plugins/echarts';
-import { onMounted, ref } from 'vue';
+import { watch, onMounted, ref, defineProps, computed } from 'vue';
 
+const props = defineProps<{
+  workData?: any[]; // 根据实际数据结构调整类型
+}>();
 const chartRef = ref<EchartsUIType>();
 const { renderEcharts } = useEcharts(chartRef);
+const chartData = computed(() => {
+  if (!props.workData) return [];
+  return props.workData.map((item) => ({
+    name: item.type,
+    value: item.quantity,
+  }));
+});
 
-onMounted(() => {
+// 监听数据变化，重新渲染图表
+watch(
+  () => props.workData,
+  (newData) => {
+    if (newData) {
+      updateChart();
+    }
+  },
+  { immediate: true },
+);
+
+// 封装图表更新逻辑
+const updateChart = () => {
   renderEcharts({
     series: [
       {
@@ -18,15 +40,8 @@ onMounted(() => {
         animationType: 'scale',
         center: ['50%', '50%'],
         color: ['#5ab1ef', '#b6a2de', '#67e0e3', '#2ec7c9'],
-        data: [
-          { name: '外包', value: 500 },
-          { name: '定制', value: 310 },
-          { name: '技术支持', value: 274 },
-          { name: '远程', value: 400 },
-        ].sort((a, b) => {
-          return a.value - b.value;
-        }),
-        name: '商业占比',
+        data: chartData.value,
+        name: '工单类型',
         radius: '80%',
         roseType: 'radius',
         type: 'pie',
@@ -37,6 +52,13 @@ onMounted(() => {
       trigger: 'item',
     },
   });
+};
+
+onMounted(() => {
+  // 组件挂载时尝试更新图表
+  if (props.workData) {
+    updateChart();
+  }
 });
 </script>
 
diff --git a/apps/web-antd/src/views/dashboard/analytics/analytics-visits-source.vue b/apps/web-antd/src/views/dashboard/analytics/analytics-visits-source.vue
index fd3bf104..e2025cfb 100644
--- a/apps/web-antd/src/views/dashboard/analytics/analytics-visits-source.vue
+++ b/apps/web-antd/src/views/dashboard/analytics/analytics-visits-source.vue
@@ -2,12 +2,41 @@
 import type { EchartsUIType } from '@vben/plugins/echarts';
 
 import { EchartsUI, useEcharts } from '@vben/plugins/echarts';
-import { onMounted, ref } from 'vue';
+import { watch, onMounted, ref, defineProps, computed } from 'vue';
 
+const props = defineProps<{
+  statusData?: any[]; // 根据实际数据结构调整类型
+}>();
 const chartRef = ref<EchartsUIType>();
 const { renderEcharts } = useEcharts(chartRef);
+const chartData = computed(() => {
+  if (!props.statusData) return [];
+  return props.statusData.map((item) => ({
+    name:
+      item.state == 0
+        ? '使用中'
+        : item.state == 1
+          ? '停用中'
+          : item.state == 2
+            ? '已报废'
+            : '闲置中',
+    value: item.quantity,
+  }));
+});
 
-onMounted(() => {
+// 监听数据变化，重新渲染图表
+watch(
+  () => props.statusData,
+  (newData) => {
+    if (newData) {
+      updateChart();
+    }
+  },
+  { immediate: true },
+);
+
+// 封装图表更新逻辑
+const updateChart = () => {
   renderEcharts({
     legend: {
       bottom: '2%',
@@ -22,12 +51,7 @@ onMounted(() => {
         animationType: 'scale',
         avoidLabelOverlap: false,
         color: ['#5ab1ef', '#b6a2de', '#67e0e3', '#2ec7c9'],
-        data: [
-          { name: '搜索引擎', value: 1048 },
-          { name: '直接访问', value: 735 },
-          { name: '邮件营销', value: 580 },
-          // { name: '联盟广告', value: 484 },
-        ],
+        data: chartData.value,
         emphasis: {
           label: {
             fontSize: '12',
@@ -47,7 +71,7 @@ onMounted(() => {
         labelLine: {
           show: false,
         },
-        name: '访问来源',
+        name: '设备状态',
         radius: ['40%', '65%'],
         type: 'pie',
       },
@@ -56,6 +80,14 @@ onMounted(() => {
       trigger: 'item',
     },
   });
+};
+
+onMounted(() => {
+  console.log('Child component mounted, props:', props.statusData);
+  // 组件挂载时尝试更新图表
+  if (props.statusData) {
+    updateChart();
+  }
 });
 </script>
 
diff --git a/apps/web-antd/src/views/dashboard/analytics/index.vue b/apps/web-antd/src/views/dashboard/analytics/index.vue
index 1f639b2a..b6a90c09 100644
--- a/apps/web-antd/src/views/dashboard/analytics/index.vue
+++ b/apps/web-antd/src/views/dashboard/analytics/index.vue
@@ -1,12 +1,5 @@
 <script lang="ts" setup>
-import type { AnalysisOverviewItem } from '@vben/common-ui';
-import type { TabOption } from '@vben/types';
-
-import {
-  AnalysisChartCard,
-  AnalysisChartsTabs,
-  AnalysisOverview,
-} from '@vben/common-ui';
+import { AnalysisChartCard, AnalysisOverview } from '@vben/common-ui';
 import {
   SvgBellIcon,
   SvgCakeIcon,
@@ -18,20 +11,21 @@ import AnalyticsTrends from './analytics-trends.vue';
 import AnalyticsVisitsData from './analytics-visits-data.vue';
 import AnalyticsVisitsSales from './analytics-visits-sales.vue';
 import AnalyticsVisitsSource from './analytics-visits-source.vue';
-import AnalyticsVisits from './analytics-visits.vue';
-import { ref,onMounted } from 'vue';
+import { ref, onMounted } from 'vue';
 import { DatePicker } from 'ant-design-vue';
-import { Button, Radio } from 'ant-design-vue';
-import type { RadioChangeEvent } from 'ant-design-vue';
-import {getIndexCount,getStatisticsCurrDay,getStatistics} from '#/api/analytics/index.ts';
-const overviewItems =ref<AnalysisOverviewItem[]>(
-  [
+import { Radio } from 'ant-design-vue';
+import {
+  getIndexCount,
+  getStatisticsCurrDay,
+  getStatistics,
+} from '#/api/analytics/index';
+const overviewItems = ref<any[]>([
   {
     icon: SvgCardIcon,
     title: '今日访客量',
     totalTitle: '总访客量',
-    totalValue: 78,
-    value: 15,
+    totalValue: 0,
+    value: 0,
   },
   {
     icon: SvgCakeIcon,
@@ -44,8 +38,8 @@ const overviewItems =ref<AnalysisOverviewItem[]>(
     icon: SvgDownloadIcon,
     title: '今日预警数量',
     totalTitle: '总预警量',
-    totalValue: 17,
-    value: 2,
+    totalValue: 0,
+    value: 0,
   },
   {
     icon: SvgBellIcon,
@@ -54,44 +48,44 @@ const overviewItems =ref<AnalysisOverviewItem[]>(
     totalValue: 0,
     value: 0,
   },
-]
-);
+]);
 
-const chartTabs: TabOption[] = [
-  {
-    label: '电量',
-    value: 'trends',
-  },
-  // {
-  //   label: '水量',
-  //   value: 'visits',
-  // },
-];
 //tab选择
 const timeUnit = ref(1);
 // 月份选择
-const selectedDate = ref('');
-const handleDateChange = (date: string) => {
-  selectedDate.value = date;
-  // 在这里可以添加根据选择日期筛选数据的逻辑
-  console.log('选择的日期:', date);
+const selectedDate = ref<any>(null);
+const paramDate = ref(null);
+
+const statisticsList = ref<any>();
+const workList = ref<any>();
+const statusDataList = ref<any>();
+const analyticsTrendsRef = ref<InstanceType<typeof AnalyticsTrends> | null>(
+  null,
+);
+const handleDateChange = (date: any) => {
+  paramDate.value = date.format('YYYY-MM');
+  // 调用子组件的方法
+  if (
+    analyticsTrendsRef.value &&
+    analyticsTrendsRef.value.getMeterRecordTrend
+  ) {
+    analyticsTrendsRef.value.getMeterRecordTrend(paramDate);
+  }
 };
 
 // 工单数量
-const indexCount = ref(0);
 async function getIndex() {
-  console.log(123);
-
   const res = await getIndexCount();
-    console.log(res);
-    // overviewItems[3].value = res.workOrdersToday
-    // overviewItems[3].totalValue = res.workOrdersTotald
-    console.log(overviewItems);
-
+  overviewItems.value[3].value = res.workOrdersToday;
+  overviewItems.value[3].totalValue = res.workOrdersTotal;
+  overviewItems.value[0].value = res.visitorsToday;
+  overviewItems.value[0].totalValue = res.visitorsTotal;
+  workList.value = res.satisfactionChartList;
+  statusDataList.value = res.statusChartVoChartList;
 }
 // 车流量
 async function getCarCount() {
-    const startDate = new Date();
+  const startDate = new Date();
   startDate.setHours(0, 0, 0, 0);
   const endDate = new Date();
   endDate.setHours(23, 59, 59, 999);
@@ -101,102 +95,87 @@ async function getCarCount() {
     const localTime = new Date(date.getTime() - timezoneOffset);
     return localTime.toISOString().slice(0, -1) + 'Z';
   };
-            const response = await fetch(
-              'https://server.cqnctc.com:6081/web/lot/net/queryOrderParkForPage',
-              {
-                method: 'POST',
-                headers: {
-                  'X-Auth-Token': `${sessionStorage.getItem('token')}`,
-                  'Content-Type': 'application/json',
-                  Authorization: `Bearer ${sessionStorage.getItem('token')}`,
-                  Accept: 'application/json, text/plain, */*',
-                },
-                body: JSON.stringify({
-    pageReq: {
-        pageNum: 1,
-        pageSize: 10
+  const response = await fetch(
+    'https://server.cqnctc.com:6081/web/lot/net/queryOrderParkForPage',
+    {
+      method: 'POST',
+      headers: {
+        'X-Auth-Token': `${sessionStorage.getItem('token')}`,
+        'Content-Type': 'application/json',
+        Authorization: `Bearer ${sessionStorage.getItem('token')}`,
+        Accept: 'application/json, text/plain, */*',
+      },
+      body: JSON.stringify({
+        pageReq: {
+          pageNum: 1,
+          pageSize: 10,
+        },
+        plNos: ['PFN000000012', 'PFN000000022', 'PFN000000025'],
+        parkInBeginTime: toLocalISOString(startDate),
+        parkInEndTime: toLocalISOString(endDate),
+        orgId: 10012,
+        parkOrderTypes: [100, 200, 201, 300, 500],
+        terminalSource: 50,
+        remark: '',
+      }),
     },
-    plNos: [
-        "PFN000000012",
-"PFN000000022",
-        "PFN000000025"
-    ],
-    parkInBeginTime: toLocalISOString(startDate),
-    parkInEndTime: toLocalISOString(endDate),
-    orgId: 10012,
-    parkOrderTypes: [
-        100,
-        200,
-        201,
-        300,
-        500
-    ],
-    terminalSource: 50,
-    remark: ""
-}),
-              },
-            );
-            const result = await response.json();
-overviewItems.value[1].value = result.data.pageTotals;
-            const response2 = await fetch(
-              'https://server.cqnctc.com:6081/web/lot/net/queryOrderParkForPage',
-              {
-                method: 'POST',
-                headers: {
-                  'X-Auth-Token': `${sessionStorage.getItem('token')}`,
-                  'Content-Type': 'application/json',
-                  Authorization: `Bearer ${sessionStorage.getItem('token')}`,
-                  Accept: 'application/json, text/plain, */*',
-                },
-                body: JSON.stringify({
-    pageReq: {
-        pageNum: 1,
-        pageSize: 10
+  );
+  const result = await response.json();
+  overviewItems.value[1].value = result.data.pageTotals;
+  const response2 = await fetch(
+    'https://server.cqnctc.com:6081/web/lot/net/queryOrderParkForPage',
+    {
+      method: 'POST',
+      headers: {
+        'X-Auth-Token': `${sessionStorage.getItem('token')}`,
+        'Content-Type': 'application/json',
+        Authorization: `Bearer ${sessionStorage.getItem('token')}`,
+        Accept: 'application/json, text/plain, */*',
+      },
+      body: JSON.stringify({
+        pageReq: {
+          pageNum: 1,
+          pageSize: 10,
+        },
+        plNos: ['PFN000000012', 'PFN000000022', 'PFN000000025'],
+        parkInBeginTime: '',
+        parkInEndTime: '',
+        orgId: 10012,
+        parkOrderTypes: [100, 200, 201, 300, 500],
+        terminalSource: 50,
+        remark: '',
+      }),
     },
-    plNos: [
-        "PFN000000012",
-"PFN000000022",
-        "PFN000000025"
-    ],
-    parkInBeginTime: "",
-    parkInEndTime: "",
-    orgId: 10012,
-    parkOrderTypes: [
-        100,
-        200,
-        201,
-        300,
-        500
-    ],
-    terminalSource: 50,
-    remark: ""
-}),
-              },
-            );
-            const result2 = await response2.json();
-            overviewItems.value[1].totalValue = result2.data.pageTotals;
-
-
-
+  );
+  const result2 = await response2.json();
+  overviewItems.value[1].totalValue = result2.data.pageTotals;
 }
 // 预警
 async function getStatisticsCurrDayCount() {
-  const res  = await getStatisticsCurrDay();
-  console.log(res);
+  const res = await getStatisticsCurrDay();
+  let total = 0;
+  for (const item of res) {
+    total += item.total;
+  }
+  overviewItems.value[2].value = total;
 }
 async function getStatisticsCount() {
-  const res  = await getStatistics();
-  console.log(res);
+  const res = await getStatistics();
+  let total = 0;
+  for (const item of res) {
+    total += item.total;
+  }
+  overviewItems.value[2].totalValue = total;
+  statisticsList.value = res;
 }
 // 电量
 
 onMounted(() => {
-   getIndex();
-   getCarCount();
-   getStatisticsCurrDayCount();
-   getStatisticsCount();
-})
-
+  getIndex();
+  getCarCount();
+  getStatisticsCurrDayCount();
+  getStatisticsCount();
+});
 </script>
 
 <template>
@@ -210,19 +189,12 @@ onMounted(() => {
         <AnalyticsVisits />
       </template>
     </AnalysisChartsTabs> -->
-    <div class="mt-5 bg-white rounded-lg">
+    <div class="mt-5 rounded-lg bg-white">
       <div
-        class="p-5 flex items-center justify-between "
-        style="
-          width: 100%;
-          height: 100px;
-        "
+        class="flex items-center justify-between p-5"
+        style="width: 100%; height: 100px"
       >
-        <Radio.Group
-          v-model:value="timeUnit"
-          @change="handleViewModeChange"
-          size="large"
-        >
+        <Radio.Group v-model:value="timeUnit" size="large">
           <Radio.Button value="1">电量</Radio.Button>
         </Radio.Group>
         <DatePicker
@@ -234,21 +206,24 @@ onMounted(() => {
         />
       </div>
       <div v-if="timeUnit == 1">
-        <AnalyticsTrends />
+        <AnalyticsTrends
+          ref="analyticsTrendsRef"
+          :selected-date="selectedDate"
+        />
       </div>
     </div>
     <div class="mt-5 w-full md:flex">
       <AnalysisChartCard class="mt-5 md:mr-4 md:mt-0 md:w-1/3" title="预警类型">
-        <AnalyticsVisitsData />
+        <AnalyticsVisitsData :statisticsData="statisticsList" />
       </AnalysisChartCard>
       <AnalysisChartCard
         class="mt-5 md:mr-4 md:mt-0 md:w-1/3"
         title="设备使用状态"
       >
-        <AnalyticsVisitsSource />
+        <AnalyticsVisitsSource :statusData="statusDataList" />
       </AnalysisChartCard>
       <AnalysisChartCard class="mt-5 md:mt-0 md:w-1/3" title="工单类型">
-        <AnalyticsVisitsSales />
+        <AnalyticsVisitsSales :workData="workList" />
       </AnalysisChartCard>
     </div>
   </div>
diff --git a/apps/web-antd/src/views/property/building/data.tsx b/apps/web-antd/src/views/property/building/data.tsx
index 29691e90..3c27113c 100644
--- a/apps/web-antd/src/views/property/building/data.tsx
+++ b/apps/web-antd/src/views/property/building/data.tsx
@@ -13,7 +13,7 @@ let arr: CommunityVO[] = [];
 const communitySelect: VbenFormSchema = {
   component: 'ApiSelect',
   fieldName: 'communityId',
-  label: '社区',
+  label: '园区名称',
   componentProps: {
     resultField: 'list', // 根据API返回结构调整
     labelField: 'communityName',
@@ -46,11 +46,11 @@ export const querySchema: FormSchemaGetter = () => [
 export const columns: VxeGridProps['columns'] = [
   { type: 'checkbox', width: 60 },
   {
-    title: '社区',
+    title: '园区名称',
     field: 'communityText',
   },
   {
-    title: '建筑',
+    title: '建筑名称',
     field: 'buildingName',
   },
   {
@@ -73,10 +73,10 @@ export const columns: VxeGridProps['columns'] = [
     title: '竣工日期',
     field: 'completionDate',
   },
-  {
-    title: '地址',
-    field: 'addr',
-  },
+  // {
+  //   title: '地址',
+  //   field: 'addr',
+  // },
   {
     title: '建筑面积(㎡)',
     field: 'area',
@@ -123,8 +123,8 @@ export const modalSchema: FormSchemaGetter = () => [
     fieldName: 'floorCount',
     component: 'InputNumber',
     componentProps: {
-      min:1,
-      precision:0,
+      min: 1,
+      precision: 0,
     },
   },
   {
@@ -132,8 +132,8 @@ export const modalSchema: FormSchemaGetter = () => [
     fieldName: 'unitCount',
     component: 'InputNumber',
     componentProps: {
-      min:1,
-      precision:0,
+      min: 1,
+      precision: 0,
     },
   },
   {
@@ -150,8 +150,8 @@ export const modalSchema: FormSchemaGetter = () => [
     fieldName: 'elevatorCount',
     component: 'InputNumber',
     componentProps: {
-      min:0,
-      precision:0,
+      min: 0,
+      precision: 0,
     },
   },
   {
@@ -163,19 +163,19 @@ export const modalSchema: FormSchemaGetter = () => [
       valueFormat: 'YYYY-MM-DD',
     },
   },
-  {
-    label: '地址',
-    fieldName: 'addr',
-    component: 'Input',
-    rules: 'required',
-  },
+  // {
+  //   label: '地址',
+  //   fieldName: 'addr',
+  //   component: 'Input',
+  //   rules: 'required',
+  // },
   {
     label: '建筑面积(㎡)',
     fieldName: 'area',
     component: 'InputNumber',
     componentProps: {
-      min:0,
-      precision:2,
+      min: 0,
+      precision: 2,
     },
   },
   {
@@ -183,8 +183,8 @@ export const modalSchema: FormSchemaGetter = () => [
     fieldName: 'insideInArea',
     component: 'InputNumber',
     componentProps: {
-      min:0,
-      precision:2,
+      min: 0,
+      precision: 2,
     },
   },
   {
@@ -192,8 +192,8 @@ export const modalSchema: FormSchemaGetter = () => [
     fieldName: 'sharedArea',
     component: 'InputNumber',
     componentProps: {
-      min:0,
-      precision:2,
+      min: 0,
+      precision: 2,
     },
   },
 ];
diff --git a/apps/web-antd/src/views/property/community/data.ts b/apps/web-antd/src/views/property/community/data.ts
index c7c7988d..e753cb35 100644
--- a/apps/web-antd/src/views/property/community/data.ts
+++ b/apps/web-antd/src/views/property/community/data.ts
@@ -1,19 +1,24 @@
-import type {FormSchemaGetter} from '#/adapter/form';
-import type {VxeGridProps} from '#/adapter/vxe-table';
-import {getPopupContainer} from '@vben/utils';
-import {getDictOptions} from '#/utils/dict';
-import {DictEnum} from '@vben/constants';
-import {renderDict} from "#/utils/render";
+import type { FormSchemaGetter } from '#/adapter/form';
+import type { VxeGridProps } from '#/adapter/vxe-table';
+import { getPopupContainer } from '@vben/utils';
+import { getDictOptions } from '#/utils/dict';
+import { DictEnum } from '@vben/constants';
+import { renderDict } from '#/utils/render';
 
 export const querySchema: FormSchemaGetter = () => [
+  // {
+  //   component: 'Select',
+  //   componentProps: {
+  //     getPopupContainer,
+  //     options: getDictOptions(DictEnum.wy_sqlx),
+  //   },
+  //   fieldName: 'communityType',
+  //   label: '园区类型',
+  // },
   {
-    component: 'Select',
-    componentProps: {
-      getPopupContainer,
-      options: getDictOptions(DictEnum.wy_sqlx),
-    },
-    fieldName: 'communityType',
-    label: '园区类型',
+    component: 'Input',
+    fieldName: 'communityName',
+    label: '园区名称',
   },
   {
     component: 'Input',
@@ -25,20 +30,20 @@ export const querySchema: FormSchemaGetter = () => [
 // 需要使用i18n注意这里要改成getter形式 否则切换语言不会刷新
 // export const columns: () => VxeGridProps['columns'] = () => [
 export const columns: VxeGridProps['columns'] = [
-  {type: 'checkbox', width: 60},
+  { type: 'checkbox', width: 60 },
   {
     title: '园区名称',
     field: 'communityName',
   },
-  {
-    title: '园区类型',
-    field: 'communityType',
-    slots: {
-      default: ({row}) => {
-        return renderDict(row.communityType, DictEnum.wy_sqlx)
-      }
-    },
-  },
+  // {
+  //   title: '园区类型',
+  //   field: 'communityType',
+  //   slots: {
+  //     default: ({row}) => {
+  //       return renderDict(row.communityType, DictEnum.wy_sqlx)
+  //     }
+  //   },
+  // },
   {
     title: '城市',
     field: 'cityFullName',
@@ -78,7 +83,7 @@ export const columns: VxeGridProps['columns'] = [
   {
     field: 'action',
     fixed: 'right',
-    slots: {default: 'action'},
+    slots: { default: 'action' },
     title: '操作',
     width: 180,
   },
@@ -182,7 +187,7 @@ export const modalSchema: FormSchemaGetter = () => [
     component: 'Textarea',
   },
   {
-    label: '社区/园区图片',
+    label: '园区图片',
     fieldName: 'img',
     component: 'ImageUpload',
     componentProps: {
diff --git a/apps/web-antd/src/views/property/floor/data.ts b/apps/web-antd/src/views/property/floor/data.ts
index 5d856420..2da66c83 100644
--- a/apps/web-antd/src/views/property/floor/data.ts
+++ b/apps/web-antd/src/views/property/floor/data.ts
@@ -5,7 +5,7 @@ export const querySchema: FormSchemaGetter = () => [
   {
     component: 'Input',
     fieldName: 'floorName',
-    label: '楼栋号',
+    label: '楼层名称',
   },
 ];
 
@@ -14,22 +14,22 @@ export const querySchema: FormSchemaGetter = () => [
 export const columns: VxeGridProps['columns'] = [
   { type: 'checkbox', width: 60 },
   {
-    title: '社区',
+    title: '园区名称',
     field: 'communityText',
   },
   {
-    title: '建筑',
+    title: '建筑名称',
     field: 'buildingText',
   },
   {
-    title: '楼栋号',
+    title: '楼层名称',
     field: 'floorName',
   },
-  {
-    title: '楼层号',
-    field: 'floorNumber',
-  },
- /* {
+  // {
+  //   title: '楼层号',
+  //   field: 'floorNumber',
+  // },
+  /* {
     title: '楼层类型',
     field: 'floorType',
   },*/
@@ -78,33 +78,21 @@ export const modalSchema: FormSchemaGetter = () => [
     defaultValue: undefined,
     label: '建筑名称',
     rules: 'selectRequired',
-    formItemClass:'col-span-2',
+    formItemClass: 'col-span-2',
   },
   {
-    label: '楼栋号',
+    label: '楼层名称',
     fieldName: 'floorName',
     component: 'Input',
     rules: 'required',
   },
-  // {
-  //   label: '楼层号',
-  //   fieldName: 'floorNumber',
-  //   component: 'Input',
-  //   rules: 'required',
-  // },
-  /*{
-    label: '楼层类型',
-    fieldName: 'floorType',
-    component: 'Select',
-    componentProps: {},
-  },*/
   {
     label: '房间数量',
     fieldName: 'roomCount',
     component: 'InputNumber',
     componentProps: {
-      min:0,
-      precision:0,
+      min: 0,
+      precision: 0,
     },
   },
   {
@@ -112,8 +100,8 @@ export const modalSchema: FormSchemaGetter = () => [
     fieldName: 'floorHeight',
     component: 'InputNumber',
     componentProps: {
-      min:0,
-      precision:0,
+      min: 0,
+      precision: 0,
     },
   },
   {
@@ -121,8 +109,8 @@ export const modalSchema: FormSchemaGetter = () => [
     fieldName: 'area',
     component: 'InputNumber',
     componentProps: {
-      min:0,
-      precision:2,
+      min: 0,
+      precision: 2,
     },
   },
   {
@@ -130,8 +118,8 @@ export const modalSchema: FormSchemaGetter = () => [
     fieldName: 'insideInArea',
     component: 'InputNumber',
     componentProps: {
-      min:0,
-      precision:2,
+      min: 0,
+      precision: 2,
     },
   },
   {
@@ -139,8 +127,8 @@ export const modalSchema: FormSchemaGetter = () => [
     fieldName: 'sharedArea',
     component: 'InputNumber',
     componentProps: {
-      min:0,
-      precision:2,
+      min: 0,
+      precision: 2,
     },
   },
 ];
diff --git a/apps/web-antd/src/views/property/room/data.ts b/apps/web-antd/src/views/property/room/data.ts
index 08d35b5b..105dfe34 100644
--- a/apps/web-antd/src/views/property/room/data.ts
+++ b/apps/web-antd/src/views/property/room/data.ts
@@ -5,11 +5,6 @@ import { getDictOptions } from '#/utils/dict';
 import { DictEnum } from '@vben/constants';
 import { renderDict } from '#/utils/render';
 export const querySchema: FormSchemaGetter = () => [
-  {
-    component: 'Input',
-    fieldName: 'communityName',
-    label: '社区',
-  },
   {
     component: 'Select',
     componentProps: {
@@ -44,11 +39,11 @@ export const columns: VxeGridProps['columns'] = [
   {
     title: '是否重要',
     field: 'isMatter',
-    slots:{
-      default:({row})=>{
-        return renderDict(row.isMatter,'wy_fjzydj')
-      }
-    }
+    slots: {
+      default: ({ row }) => {
+        return renderDict(row.isMatter, 'wy_fjzydj');
+      },
+    },
   },
 
   {
@@ -96,25 +91,25 @@ export const modalSchema: FormSchemaGetter = () => [
       getPopupContainer,
       options: getDictOptions(DictEnum.wy_room_type),
     },
-    rules:'selectRequired'
+    rules: 'selectRequired',
   },
   {
     label: '建筑面积',
     fieldName: 'area',
     component: 'InputNumber',
-    componentProps:{
-      min:0,
+    componentProps: {
+      min: 0,
     },
-    rules:'required'
+    rules: 'required',
   },
   {
     label: '使用面积',
     fieldName: 'insideInArea',
     component: 'InputNumber',
-    componentProps:{
-      min:0,
+    componentProps: {
+      min: 0,
     },
-    rules:'required'
+    rules: 'required',
   },
   {
     label: '是否重要',
@@ -123,7 +118,7 @@ export const modalSchema: FormSchemaGetter = () => [
     componentProps: {
       options: getDictOptions('wy_fjzydj'),
     },
-    rules:'selectRequired'
+    rules: 'selectRequired',
   },
   {
     label: '状态',
@@ -133,7 +128,7 @@ export const modalSchema: FormSchemaGetter = () => [
       getPopupContainer,
       options: getDictOptions(DictEnum.wy_fjzt),
     },
-    rules:'selectRequired'
+    rules: 'selectRequired',
   },
   {
     label: '房间图片',

From 38f68770318920eb172fec0b300ffef9304a00cf Mon Sep 17 00:00:00 2001
From: fyy <2717885210@qq.com>
Date: Sat, 6 Sep 2025 10:55:22 +0800
Subject: [PATCH 27/30] =?UTF-8?q?fix:=20=E4=BF=AE=E6=94=B9=E9=A6=96?=
 =?UTF-8?q?=E9=A1=B5=E8=BD=A6=E6=B5=81=E9=87=8F=E6=8E=A5=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 apps/web-antd/src/views/dashboard/analytics/index.vue | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

diff --git a/apps/web-antd/src/views/dashboard/analytics/index.vue b/apps/web-antd/src/views/dashboard/analytics/index.vue
index b6a90c09..ab1e5711 100644
--- a/apps/web-antd/src/views/dashboard/analytics/index.vue
+++ b/apps/web-antd/src/views/dashboard/analytics/index.vue
@@ -96,13 +96,11 @@ async function getCarCount() {
     return localTime.toISOString().slice(0, -1) + 'Z';
   };
   const response = await fetch(
-    'https://server.cqnctc.com:6081/web/lot/net/queryOrderParkForPage',
+    'https://server.cqnctc.com:6081/web/thirdParty/queryInParkData',
     {
       method: 'POST',
       headers: {
-        'X-Auth-Token': `${sessionStorage.getItem('token')}`,
         'Content-Type': 'application/json',
-        Authorization: `Bearer ${sessionStorage.getItem('token')}`,
         Accept: 'application/json, text/plain, */*',
       },
       body: JSON.stringify({
@@ -123,13 +121,11 @@ async function getCarCount() {
   const result = await response.json();
   overviewItems.value[1].value = result.data.pageTotals;
   const response2 = await fetch(
-    'https://server.cqnctc.com:6081/web/lot/net/queryOrderParkForPage',
+    'https://server.cqnctc.com:6081/web/thirdParty/queryInParkData',
     {
       method: 'POST',
       headers: {
-        'X-Auth-Token': `${sessionStorage.getItem('token')}`,
         'Content-Type': 'application/json',
-        Authorization: `Bearer ${sessionStorage.getItem('token')}`,
         Accept: 'application/json, text/plain, */*',
       },
       body: JSON.stringify({

From 621674ed1f7bfae36d13e7184eca1eca6b08b17f Mon Sep 17 00:00:00 2001
From: zcxlsm <patrickstarlsm@163.com>
Date: Sat, 6 Sep 2025 13:15:36 +0800
Subject: [PATCH 28/30] =?UTF-8?q?refactor(web-antd):=20=E7=94=A8=20SSE=20?=
 =?UTF-8?q?=E6=9B=BF=E4=BB=A3=20WebSocket=20=E5=AE=9E=E7=8E=B0=E9=80=9A?=
 =?UTF-8?q?=E7=9F=A5=E5=92=8C=E7=94=B5=E8=A1=A8=E6=95=B0=E6=8D=AE=E5=AE=9E?=
 =?UTF-8?q?=E6=97=B6=E6=8E=A8=E9=80=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 apps/web-antd/src/store/auth.ts               | 14 ---
 apps/web-antd/src/store/notify.ts             | 87 ++++++++++---------
 .../elctricitySituation/index.vue             | 66 +++++++-------
 3 files changed, 79 insertions(+), 88 deletions(-)

diff --git a/apps/web-antd/src/store/auth.ts b/apps/web-antd/src/store/auth.ts
index 56a6fdd2..2160ba05 100644
--- a/apps/web-antd/src/store/auth.ts
+++ b/apps/web-antd/src/store/auth.ts
@@ -16,8 +16,6 @@ import { $t } from '#/locales'
 
 import { useDictStore } from './dict'
 
-import { initWebSocket, getWebSocketService } from '#/api/websocket'
-
 export const useAuthStore = defineStore('auth', () => {
   const accessStore = useAccessStore()
   const userStore = useUserStore()
@@ -81,13 +79,6 @@ export const useAuthStore = defineStore('auth', () => {
     try {
       await seeConnectionClose()
       await doLogout()
-      /**
-       * 断开websocket连接
-       */
-      const ws = getWebSocketService();
-      if(ws) {
-        ws.close();
-      }
     } catch (error) {
       console.error(error)
     } finally {
@@ -128,11 +119,6 @@ export const useAuthStore = defineStore('auth', () => {
     }
     userStore.setUserInfo(userInfo)
 
-    /**
-     * 初始化websocket
-     */
-    initWebSocket()
-
     /**
      * 需要重新加载字典
      * 比如退出登录切换到其他租户
diff --git a/apps/web-antd/src/store/notify.ts b/apps/web-antd/src/store/notify.ts
index a183ba15..00e81fa4 100644
--- a/apps/web-antd/src/store/notify.ts
+++ b/apps/web-antd/src/store/notify.ts
@@ -1,21 +1,21 @@
-import type { NotificationItem } from '@vben/layouts';
+import type { NotificationItem } from '@vben/layouts'
 
-import { computed, ref, watch } from 'vue';
+import { computed, ref, watch } from 'vue'
 
-import { useAppConfig } from '@vben/hooks';
-import { SvgMessageUrl } from '@vben/icons';
-import { $t } from '@vben/locales';
-import { useAccessStore, useUserStore } from '@vben/stores';
+import { useAppConfig } from '@vben/hooks'
+import { SvgMessageUrl } from '@vben/icons'
+import { $t } from '@vben/locales'
+import { useAccessStore, useUserStore } from '@vben/stores'
 
-import { useEventSource } from '@vueuse/core';
-import { notification } from 'ant-design-vue';
-import dayjs from 'dayjs';
-import { defineStore } from 'pinia';
+import { useEventSource } from '@vueuse/core'
+import { notification } from 'ant-design-vue'
+import dayjs from 'dayjs'
+import { defineStore } from 'pinia'
 
 const { apiURL, clientId, sseEnable } = useAppConfig(
   import.meta.env,
   import.meta.env.PROD,
-);
+)
 
 export const useNotifyStore = defineStore(
   'app-notify',
@@ -23,18 +23,18 @@ export const useNotifyStore = defineStore(
     /**
      * return才会被持久化 存储全部消息
      */
-    const notificationList = ref<NotificationItem[]>([]);
-    const sseList = ref<string[]>(["111"]);
-    const userStore = useUserStore();
+    const notificationList = ref<NotificationItem[]>([])
+    const sseList = ref<string[]>(["111"])
+    const userStore = useUserStore()
     const userId = computed(() => {
-      return userStore.userInfo?.userId || '0';
-    });
+      return userStore.userInfo?.userId || '0'
+    })
 
     const notifications = computed(() => {
       return notificationList.value.filter(
         (item) => item.userId === userId.value,
-      );
-    });
+      )
+    })
 
     /**
      * 开始监听sse消息
@@ -44,40 +44,45 @@ export const useNotifyStore = defineStore(
        * 未开启 不监听
        */
       if (!sseEnable) {
-        return;
+        return
       }
-      const accessStore = useAccessStore();
-      const token = accessStore.accessToken;
+      const accessStore = useAccessStore()
+      const token = accessStore.accessToken
 
-      const sseAddr = `${apiURL}/resource/sse?clientid=${clientId}&Authorization=Bearer ${token}`;
+      const sseAddr = `${apiURL}/resource/sse?clientid=${clientId}&Authorization=Bearer ${token}`
 
       const { data } = useEventSource(sseAddr, [], {
         autoReconnect: {
           delay: 1000,
           onFailed() {
-            console.error('sse重连失败.');
+            console.error('sse重连失败.')
           },
           retries: 3,
         },
-      });
+      })
 
       watch(data, (message) => {
-        if (!message) return;
-        console.log(`接收到消息: ${message}`);
+        if (!message) return
+        console.log(`接收到消息: ${message}`)
 
         try {
           // 尝试解析JSON
-          const obj = JSON.parse(message);
+          const obj = JSON.parse(message)
           // 检查解析结果是否为对象且不为null
-          if (obj.getType() ==="yvjin"){
-            sseList.value.join(message)
+          if (obj.type === "yvjin") {
+            sseList.value.push(message)
+          }
+
+          // 仪表数据
+          if (obj.type === "meter") {
+            sseList.value.push(message)
           }
         } catch (e) {
           notification.success({
             description: message,
             duration: 3,
             message: $t('component.notice.received'),
-          });
+          })
 
           notificationList.value.unshift({
             // avatar: `https://api.multiavatar.com/${random(0, 10_000)}.png`, 随机头像
@@ -87,12 +92,12 @@ export const useNotifyStore = defineStore(
             message,
             title: $t('component.notice.title'),
             userId: userId.value,
-          });
+          })
 
           // 需要手动置空 vue3在值相同时不会触发watch
-          data.value = null;
+          data.value = null
         }
-      });
+      })
     }
 
     /**
@@ -102,10 +107,10 @@ export const useNotifyStore = defineStore(
       notificationList.value
         .filter((item) => item.userId === userId.value)
         .forEach((item) => {
-          item.isRead = true;
-        });
+          item.isRead = true
+        })
     }
-    function getsseList(){
+    function getsseList() {
       console.log(sseList.value)
       return sseList.value
     }
@@ -115,7 +120,7 @@ export const useNotifyStore = defineStore(
      * @param item 通知
      */
     function setRead(item: NotificationItem) {
-      !item.isRead && (item.isRead = true);
+      !item.isRead && (item.isRead = true)
     }
 
     /**
@@ -124,7 +129,7 @@ export const useNotifyStore = defineStore(
     function clearAllMessage() {
       notificationList.value = notificationList.value.filter(
         (item) => item.userId !== userId.value,
-      );
+      )
     }
 
     /**
@@ -141,7 +146,7 @@ export const useNotifyStore = defineStore(
       notificationList.value
         .filter((item) => item.userId === userId.value)
         .some((item) => !item.isRead),
-    );
+    )
 
     return {
       $reset,
@@ -154,11 +159,11 @@ export const useNotifyStore = defineStore(
       setRead,
       showDot,
       startListeningMessage,
-    };
+    }
   },
   {
     persist: {
       pick: ['notificationList'],
     },
   },
-);
+)
diff --git a/apps/web-antd/src/views/property/energyManagement/electricEnergy/elctricitySituation/index.vue b/apps/web-antd/src/views/property/energyManagement/electricEnergy/elctricitySituation/index.vue
index e5642255..767526bb 100644
--- a/apps/web-antd/src/views/property/energyManagement/electricEnergy/elctricitySituation/index.vue
+++ b/apps/web-antd/src/views/property/energyManagement/electricEnergy/elctricitySituation/index.vue
@@ -1,45 +1,49 @@
 <script setup lang="ts">
+import { useNotifyStore } from '#/store';
 import { useAccessStore } from '@vben/stores';
+import FloorTree from '../components/floor-tree.vue';
 import { BackTop, message, Spin } from 'ant-design-vue';
 import { Page, VbenCountToAnimator } from '@vben/common-ui';
-import { ref, onMounted, onBeforeUnmount, reactive } from 'vue';
-import FloorTree from '../components/floor-tree.vue';
-import { getWebSocketService } from '#/api/websocket';
+import { ref, onMounted, onBeforeUnmount, reactive, watch } from 'vue';
 import { currentReading } from '#/api/property/energyManagement/meterInfo';
 
-const ws = getWebSocketService();
+const notifyStore = useNotifyStore();
 const readingData = ref<any>({});
 const readingTime = ref('');
-let readingLoading = ref(false);
+const readingLoading = ref(false);
 
-if (ws) {
-  // 使用setOnMessageCallback方法设置消息回调
-  ws.setOnMessageCallback((event: MessageEvent) => {
-    // 解析数据并更新UI
-    try {
-      const data = JSON.parse(event.data);
-      if (data.type === 'meter') {
-        if (typeof data.data === 'undefined') {
-          message.warn('当前楼层暂无电表！');
+onMounted(() => {
+  notifyStore.startListeningMessage();
+  // 监听sseList的变化
+  watch(
+    () => notifyStore.sseList,
+    (val) => {
+      const latestMessage = val[val.length - 1];
+
+      try {
+        // 尝试解析消息内容
+        const parsedMessage = JSON.parse(latestMessage);
+        console.log('收到sse消息:', parsedMessage);
+        if (parsedMessage.type === 'meter') {
+          // 根据消息内容执行相应操作
+          handleSSEMessage(parsedMessage);
         }
-        readingData.value = data.data;
-        readingTime.value = data.readingTime;
+      } catch (e) {
+        console.log('收到非JSON消息:', latestMessage);
+        // 处理非JSON格式消息
       }
-    } catch (e) {
-      console.error('Error parsing data:');
-    }
-    readingLoading.value = false;
-  });
+    },
+    { deep: true },
+  );
+});
 
-  // 如果需要，也可以设置错误回调
-  ws.setOnErrorCallback((error: any) => {
-    console.log('Error in WebSocket:');
-    currentReading({ meterType: 0, floorId: 0 });
-    readingLoading.value = false;
-  });
-}else {
+function handleSSEMessage(data: any) {
+  if (data.data.length === 0) {
+    message.warn('当前楼层暂无电表！');
+  }
+  readingData.value = data.data;
+  readingTime.value = data.readingTime;
   readingLoading.value = false;
-  message.warn('websocket未连接！请刷新页面重试！');
 }
 
 onBeforeUnmount(() => {
@@ -50,10 +54,6 @@ async function handleSelectFloor(selectedKeys, info) {
   if (typeof selectedKeys[0] === 'undefined') {
     return;
   }
-  if (ws.webSocket.readyState !== 1) {
-    message.warn('websocket未连接！请刷新页面重试！');
-    return;
-  }
   readingLoading.value = true;
   await currentReading({
     meterType: 1,

From a6f5b0c56dd7356f75f0d246e90a544f2b2387b8 Mon Sep 17 00:00:00 2001
From: fyy <2717885210@qq.com>
Date: Sat, 6 Sep 2025 13:32:28 +0800
Subject: [PATCH 29/30] =?UTF-8?q?feat:=20=E4=BF=AE=E5=A4=8Dbug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/views/dashboard/analytics/index.vue   | 29 ++--------
 .../productManagement/data.ts                 |  5 +-
 .../productManagement/index.vue               | 54 ++++++++++++++++---
 3 files changed, 54 insertions(+), 34 deletions(-)

diff --git a/apps/web-antd/src/views/dashboard/analytics/index.vue b/apps/web-antd/src/views/dashboard/analytics/index.vue
index ab1e5711..f330e43d 100644
--- a/apps/web-antd/src/views/dashboard/analytics/index.vue
+++ b/apps/web-antd/src/views/dashboard/analytics/index.vue
@@ -119,32 +119,9 @@ async function getCarCount() {
     },
   );
   const result = await response.json();
-  overviewItems.value[1].value = result.data.pageTotals;
-  const response2 = await fetch(
-    'https://server.cqnctc.com:6081/web/thirdParty/queryInParkData',
-    {
-      method: 'POST',
-      headers: {
-        'Content-Type': 'application/json',
-        Accept: 'application/json, text/plain, */*',
-      },
-      body: JSON.stringify({
-        pageReq: {
-          pageNum: 1,
-          pageSize: 10,
-        },
-        plNos: ['PFN000000012', 'PFN000000022', 'PFN000000025'],
-        parkInBeginTime: '',
-        parkInEndTime: '',
-        orgId: 10012,
-        parkOrderTypes: [100, 200, 201, 300, 500],
-        terminalSource: 50,
-        remark: '',
-      }),
-    },
-  );
-  const result2 = await response2.json();
-  overviewItems.value[1].totalValue = result2.data.pageTotals;
+  overviewItems.value[1].value = result.data.todayCount;
+
+  overviewItems.value[1].totalValue = result.data.allCount;
 }
 // 预警
 async function getStatisticsCurrDayCount() {
diff --git a/apps/web-antd/src/views/property/greenPlantRentalManagement/productManagement/data.ts b/apps/web-antd/src/views/property/greenPlantRentalManagement/productManagement/data.ts
index e48c3416..c223f1ad 100644
--- a/apps/web-antd/src/views/property/greenPlantRentalManagement/productManagement/data.ts
+++ b/apps/web-antd/src/views/property/greenPlantRentalManagement/productManagement/data.ts
@@ -46,6 +46,7 @@ export const columns: VxeGridProps['columns'] = [
   {
     title: '图片',
     field: 'imgPath',
+    slots: { default: 'imgPath' },
   },
   {
     title: '规格',
@@ -121,9 +122,9 @@ export const modalSchema: FormSchemaGetter = () => [
     fieldName: 'rent',
     component: 'InputNumber',
     rules: 'required',
-    componentProps:{
+    componentProps: {
       precision: 2,
-    }
+    },
   },
   {
     label: '库存数量',
diff --git a/apps/web-antd/src/views/property/greenPlantRentalManagement/productManagement/index.vue b/apps/web-antd/src/views/property/greenPlantRentalManagement/productManagement/index.vue
index c4bdcbb5..10e29afb 100644
--- a/apps/web-antd/src/views/property/greenPlantRentalManagement/productManagement/index.vue
+++ b/apps/web-antd/src/views/property/greenPlantRentalManagement/productManagement/index.vue
@@ -1,11 +1,11 @@
 <script setup lang="ts">
 import { Page, useVbenModal, type VbenFormProps } from '@vben/common-ui';
 import { getVxePopupContainer } from '@vben/utils';
-import { Modal, Popconfirm, Space  } from 'ant-design-vue';
+import { Modal, Popconfirm, Space } from 'ant-design-vue';
 import {
   useVbenVxeGrid,
   vxeCheckboxChecked,
-  type VxeGridProps
+  type VxeGridProps,
 } from '#/adapter/vxe-table';
 import {
   plantsProductList,
@@ -15,6 +15,7 @@ import type { PropertyForm } from '#/api/property/productManagement/model';
 import PlantsProductModal from './plantsProduct-modal.vue';
 import PlantsProductDetail from './plantsProduct-detail.vue';
 import { columns, querySchema } from './data';
+import { ossInfo } from '#/api/system/oss';
 const formOptions: VbenFormProps = {
   commonConfig: {
     labelWidth: 80,
@@ -38,18 +39,47 @@ const gridOptions: VxeGridProps = {
   proxyConfig: {
     ajax: {
       query: async ({ page }, formValues = {}) => {
-        return await plantsProductList({
+        const result = await plantsProductList({
           pageNum: page.currentPage,
           pageSize: page.pageSize,
           ...formValues,
         });
+
+        // 预处理图片路径
+        if (result.rows && result.rows.length > 0) {
+          // 收集所有图片路径
+          const imgPaths = result.rows
+            .filter((row: any) => row.imgPath)
+            .map((row: any) => row.imgPath);
+
+          if (imgPaths.length > 0) {
+            try {
+              // 批量获取图片URL
+              const imgUrls = await ossInfo(imgPaths);
+              const urlMap = new Map(
+                imgUrls.map((item) => [item.fileName, item.url]),
+              );
+
+              // 将URL映射回数据行
+              result.rows.forEach((row: any) => {
+                if (row.imgPath && urlMap.has(row.imgPath)) {
+                  row._imgUrl = urlMap.get(row.imgPath);
+                }
+              });
+            } catch (error) {
+              console.error('获取图片URL失败:', error);
+            }
+          }
+        }
+
+        return result;
       },
     },
   },
   rowConfig: {
     keyField: 'id',
   },
-  id: 'property-property-index'
+  id: 'property-property-index',
 };
 
 const [BasicTable, tableApi] = useVbenVxeGrid({
@@ -98,6 +128,9 @@ function handleMultiDelete() {
     },
   });
 }
+function getImgUrl(row: any) {
+  return row._imgUrl || '';
+}
 </script>
 
 <template>
@@ -110,7 +143,8 @@ function handleMultiDelete() {
             danger
             type="primary"
             v-access:code="['property:plantsProduct:remove']"
-            @click="handleMultiDelete">
+            @click="handleMultiDelete"
+          >
             {{ $t('pages.common.delete') }}
           </a-button>
           <a-button
@@ -152,8 +186,16 @@ function handleMultiDelete() {
           </Popconfirm>
         </Space>
       </template>
+      <template #imgPath="{ row }">
+        <img
+          v-if="row.imgPath"
+          :src="getImgUrl(row)"
+          alt=""
+          class="h-[50px] w-[70px]"
+        />
+      </template>
     </BasicTable>
     <PlantsProduct @reload="tableApi.query()" />
-    <PlantsProductDetailModal/>
+    <PlantsProductDetailModal />
   </Page>
 </template>

From ba6e8652191a272bb04bbb5146981c99fef06fb5 Mon Sep 17 00:00:00 2001
From: fyy <2717885210@qq.com>
Date: Sat, 6 Sep 2025 15:39:47 +0800
Subject: [PATCH 30/30] =?UTF-8?q?feat:=20=E6=B5=8B=E8=AF=95=E5=9B=BE?=
 =?UTF-8?q?=E7=89=87=E5=9B=9E=E6=98=BE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../greenPlantRentalManagement/productManagement/index.vue     | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/apps/web-antd/src/views/property/greenPlantRentalManagement/productManagement/index.vue b/apps/web-antd/src/views/property/greenPlantRentalManagement/productManagement/index.vue
index 10e29afb..f8586ea6 100644
--- a/apps/web-antd/src/views/property/greenPlantRentalManagement/productManagement/index.vue
+++ b/apps/web-antd/src/views/property/greenPlantRentalManagement/productManagement/index.vue
@@ -56,8 +56,9 @@ const gridOptions: VxeGridProps = {
             try {
               // 批量获取图片URL
               const imgUrls = await ossInfo(imgPaths);
+
               const urlMap = new Map(
-                imgUrls.map((item) => [item.fileName, item.url]),
+                imgUrls.map((item) => [item.ossId, item.url]),
               );
 
               // 将URL映射回数据行