feat

apps/web-antd/src/api/analytics/index.ts

@@ -17,6 +17,10 @@ export function getStatisticsCurrDay() {
 export function getStatistics() {
   return requestClient.get<any>('/sis/alarmEvents/query/statistics');
 }
+// 工单
+export function getworkOrder() {
+  return requestClient.get<any>('/property/screen/typeWorkOrderHistogram');
+}
 // /**
 //  * 导出资产管理列表
 //  * @param params

apps/web-antd/src/views/dashboard/analytics/index.vue

@@ -218,6 +218,8 @@ onMounted(() => {
         />
       </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 :statisticsData="statisticsList" />

apps/web-antd/src/views/property/attendanceManagement/workforceManagement/arrangement-modal.vue

@@ -127,7 +127,7 @@ const columns = [
             },
             style: 'margin-right: 4px;',
           },
-          () => user.userName,
+          () => user.nickName,
         ),
       ),
   },
@@ -299,7 +299,7 @@ async function handleConfirm() {
           deptId: item.dept.deptId, //部门ID
           deptName: item.dept.deptName, //部门名称
           employeeId: user.userId, //员工ID
-          employeeName: user.userName, //员工姓名
+          employeeName: user.nickName, //员工姓名
         });
       }
     }

apps/web-antd/src/views/property/attendanceManagement/workforceManagement/data.ts

@@ -59,7 +59,7 @@ export const querySchema: FormSchemaGetter = () => [
 export const unitQuerySchema: FormSchemaGetter = () => [
   {
     component: 'Input',
-    fieldName: 'userName',
+    fieldName: 'nickName',
     label: '姓名',
   },
   {
@@ -83,7 +83,7 @@ export const columns: VxeGridProps['columns'] = [
   },
   {
     title: '人员',
-    field: 'remoteUserVo.userName',
+    field: 'remoteUserVo.nickName',
     width: 120,
     // width: 'auto',
   },
@@ -196,7 +196,7 @@ export const unitColumns: VxeGridProps['columns'] = [
   },
   {
     title: '姓名',
-    field: 'userName',
+    field: 'nickName',
     minWidth: 120,
   },
   {

apps/web-antd/src/views/property/attendanceManagement/workforceManagement/unit-person-modal.vue

@@ -240,7 +240,7 @@ watch(selectedDeptIds, (newVal) => {
               :key="user.userId"
               style="margin-right: 8px"
             >
-              <Tag>{{ user.userName }}</Tag>
+              <Tag>{{ user.nickName }}</Tag>
             </span>
           </div>
           <BasicTable> </BasicTable>

apps/web-antd/src/views/property/attendanceManagement/workforceManagement/workforce-day-detail.vue

@@ -87,7 +87,7 @@ async function handleClosed() {
               :key="item.id"
               class="wrap-cell"
             >
-              {{ item.remoteUserVo.userName }}
+              {{ item.remoteUserVo.nickName }}
               <span v-if="index !== row.userGroupList.length - 1">、</span>
             </span>
           </template>

apps/web-antd/src/views/property/attendanceManagement/workforceManagement/workforce-detail.vue

@@ -85,7 +85,7 @@ const columns = [
             },
             style: 'margin-right: 4px;',
           },
-          () => user.userName,
+          () => user.nickName,
         ),
       ),
   },
@@ -196,7 +196,7 @@ const [BasicModal, modalApi] = useVbenModal({
           }
           deptMap.get(deptId).users.push({
             userId: item.remoteUserVo.userId,
-            userName: item.remoteUserVo.userName,
+            nickName: item.remoteUserVo.nickName,
           });
         }
         // 转换为 tableData 格式
@@ -254,7 +254,7 @@ async function handleConfirm() {
         deptId: item.dept.deptId,
         deptName: item.dept.deptName,
         employeeId: user.userId,
-        employeeName: user.userName,
+        employeeName: user.nickName,
       })),
     );
     await arrangementUpdate(data);

apps/web-antd/src/views/property/businessManagement/workOrderPending/data.ts

@@ -20,10 +20,6 @@ export const columns: VxeGridProps['columns'] = [
     title: '工单编号',
     field: 'orderNo',
   },
-  {
-    title: '工单名称',
-    field: 'orderName',
-  },
   {
     title: '工单类型',
     field: 'typeName',

apps/web-antd/src/views/property/businessManagement/workOrderProcessed/data.ts

@@ -23,11 +23,6 @@ export const columns: VxeGridProps['columns'] = [
     field: 'orderNo',
     width: 200,
   },
-  {
-    title: '工单名称',
-    field: 'orderName',
-    minWidth: 180,
-  },
   {
     title: '工单类型',
     field: 'typeName',

apps/web-antd/src/views/property/businessManagement/workOrders/data.ts

@@ -39,11 +39,6 @@ export const columns: VxeGridProps['columns'] = [
     field: 'orderNo',
     width: 180,
   },
-  {
-    title: '工单名称',
-    field: 'orderName',
-    minWidth: 180,
-  },
   {
     title: '工单类型',
     field: 'typeName',

apps/web-antd/src/views/screen/property/analytics-trends.vue

@@ -0,0 +1,141 @@
+<script lang="ts" setup>
+import type { EchartsUIType } from '@vben/plugins/echarts';
+
+import { EchartsUI, useEcharts } from '@vben/plugins/echarts';
+import { onMounted, ref, defineExpose } from 'vue';
+import { meterRecordTrend } from '#/api/property/energyManagement/meterRecord';
+import dayjs from 'dayjs';
+import * as echarts from "echarts";
+const chartRef = ref<EchartsUIType>();
+const { renderEcharts } = useEcharts(chartRef);
+// 添加日期选择相关逻辑
+const selectedDate = ref<string>(dayjs().format('YYYY-MM'));
+// 获取当月天数
+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 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,
+  });
+
+  // 处理返回的数据
+  const chartData = res.day.nowMonth.data || [];
+
+  // 创建一个映射，将日期和数值对应起来
+  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: 125,
+      containLabel: true,
+      left: '2%',
+      right: '8%',
+      top: '8%',
+    },
+    series: [
+      {
+        areaStyle: {},
+        data: seriesData,
+        itemStyle: {
+          color: '#3ec6ff',
+        },
+        smooth: true,
+        type: 'line',
+        areaStyle: {
+          color: new echarts.graphic.LinearGradient(
+            0,
+            0,
+            0,
+            1, // 上→下
+            [
+              { offset: 0, color: '#32B7E9' },
+              { offset: 1, color: 'rgba(50,183,233,0)' },
+            ],
+          ),
+        },
+      },
+    ],
+    tooltip: {
+      axisPointer: {
+        lineStyle: {
+          width: 1,
+        },
+      },
+      trigger: 'axis',
+    },
+    // xAxis: {
+    //   axisTick: {
+    //     show: false,
+    //   },
+    //   boundaryGap: false,
+    //   data: Array.from({ length: 18 }).map((_item, index) => `${index + 6}:00`),
+    //   type: 'category',
+    // },
+    xAxis: {
+      name: '月',
+      axisTick: {
+        show: false,
+      },
+      boundaryGap: false,
+      data: days,
+      splitLine: {
+        lineStyle: {
+          type: 'solid',
+          width: 1,
+        },
+        show: false,
+      },
+      type: 'category',
+      axisLabel: { color: '#fff' },
+    },
+    yAxis: [
+      {
+        name: 'KW.h',
+        axisTick: {
+          show: false,
+        },
+        // max: 800,
+        splitArea: {
+          show: false,
+        },
+        splitNumber: 4,
+        type: 'value',
+        axisLabel: { color: '#fff' },
+        splitLine: { lineStyle: { color: '#1e90ff22' } },
+      },
+    ],
+  });
+};
+onMounted(async () => {
+  getMeterRecordTrend(selectedDate);
+});
+// 暴露方法给父组件调用
+defineExpose({
+  getMeterRecordTrend,
+});
+</script>
+
+<template>
+  <div>
+    <EchartsUI ref="chartRef" />
+  </div>
+</template>

apps/web-antd/src/views/screen/property/index.vue

@@ -53,7 +53,7 @@
             <div
               ref="barChart"
               class="bar-chart"
-              style="width: 100%; height: 100%"
+              style="width: 100%; height:242px"
             ></div>
           </div>
           <div class="second">
@@ -72,14 +72,11 @@
           <div class="content-center-second">
             <div class="second-item" @click="changeToPersonnelDuty">
               <div>
-                <div class="second-item-box1">
+                <div class="second-item-box1">645</div>
-                645
-              </div>
                 <div class="second-item-box-label">采购部</div>
               </div>
               <div>
-  <div class="second-item-box2">729
+                <div class="second-item-box2">729</div>
-              </div>
                 <div class="second-item-box-label">研发部</div>
               </div>
               <div>
@@ -99,32 +96,51 @@
         </div>
         <div class="content-right">
           <div class="first">
-            <div ref="waterChart" class="water-chart"></div>
+<!--            <div ref="waterChart" class="water-chart"></div>-->
             <!-- <div ref="pie3dChart" class="pie3d-chart"></div> -->
+            <div class="mt-8" style="position: relative">
+              <div
+                class="flex items-center justify-between p-5"
+              >
+                <Radio.Group v-model:value="timeUnit" size="small">
+                  <Radio.Button value="1" style="background-color: transparent;color: #fff">电量</Radio.Button>
+                </Radio.Group>
+                <DatePicker
+                  v-model:value="selectedDate"
+                  picker="month"
+                  placeholder="请选择月份"
+                  style="width: 130px;height: 25px;background-color: transparent;"
+                  @change="handleDateChange"
+                  class="white-text-datepicker"
+                />
+              </div>
+              <div v-if="timeUnit == 1">
+                <AnalyticsTrends
+                  ref="analyticsTrendsRef"
+                  :selected-date="selectedDate"
+                />
+              </div>
+            </div>
           </div>
           <div class="second">
             <div class="second-box">
-              <div class="box-content">
+              <div class="box-content" v-for="(item,index) in warning" :key="index">
-                <div class="box-content-label">维修</div>
+                <div class="box-content-label">{{ item.typeName }}</div>
-                <div class="box-content-num">132</div>
+                <div class="box-content-num">{{item.total}}</div>
-              </div>
-              <div class="box-content">
-                <div class="box-content-label">保洁</div>
-                <div class="box-content-num">862</div>
-              </div>
-              <div class="box-content">
-                <div class="box-content-label">客服服务</div>
-                <div class="box-content-num">272</div>
-              </div>
-              <div class="box-content">
-                <div class="box-content-label">安保</div>
-                <div class="box-content-num">272</div>
               </div>
             </div>
             <!-- <div ref="waterChart" class="water-chart"></div> -->
           </div>
           <div class="third">
-            <div ref="deviceChart" class="device-chart"></div>
+<!--            <div ref="deviceChart" class="device-chart"></div>-->
+            <div class="third-item">
+              <div class="third-title">会议室总数</div>
+              <div class="third-num">557</div>
+            </div>
+            <div class="third-item">
+              <div class="third-title">当日预约会议室总数</div>
+              <div class="third-num">669</div>
+            </div>
           </div>
         </div>
       </div>
@@ -133,17 +149,77 @@
 </template>
 
 <script setup lang="ts">
+import {getStatistics,getworkOrder} from '#/api/analytics';
+import AnalyticsTrends from './analytics-trends.vue';
+import { Radio } from 'ant-design-vue';
+
+//预警类型
+const warning = ref([
+  // {
+  //   "typeCode": 1025,
+  //   "typeName": "车辆违停占用报警",
+  //   "total": 121
+  // },
+  // {
+  //   "typeCode": 1008,
+  //   "typeName": "周界闯入",
+  //   "total": 64306
+  // },
+  // {
+  //   "typeCode": 1026,
+  //   "typeName": "黑名单人员",
+  //   "total": 25
+  // },
+  // {
+  //   "typeCode": 1007,
+  //   "typeName": "人员聚集",
+  //   "total": 250
+  // },
+  // {
+  //   "typeCode": 1028,
+  //   "typeName": "非法停车",
+  //   "total": 628
+  // }
+])
+async function getWarning() {
+  warning.value = await getStatistics();
+}
+//tab选择
+const timeUnit = ref(1);
+// 月份选择
+const selectedDate = ref<any>(null);
+const paramDate = ref(null);
+
+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);
+  }
+};
+
+
+
+
+
+
 import { ref, onMounted, onBeforeUnmount } from 'vue';
 import { useRouter } from 'vue-router';
 import * as echarts from 'echarts';
 import 'echarts-gl';
-import { getThreeDBarOption } from '#/utils/threeDBarOption';
 import { renderPie3DChart } from '#/utils/pie3d';
 import {
   addChartToResizeManager,
   removeChartFromResizeManager,
 } from '#/utils/echartsResize';
 import { useFlexibleRem } from '#/utils/useFlexibleRem';
+import {DatePicker} from "ant-design-vue";
 useFlexibleRem();
 // 路由
 const router = useRouter();
@@ -197,33 +273,35 @@ const updateTime = () => {
   if (dateElement) dateElement.innerText = date;
 };
 
-// 初始化柱状图
-const initBarChart = () => {
-  if (!barChart.value) return;
 
+// 初始化柱状图
+const initBarChart = async () => {
+  if (!barChart.value) return;
   const myChart = echarts.init(barChart.value);
+  const workOrder = await getworkOrder();
+  const title = workOrder.map((item) => {return item.type})
+  const statuses = ['已派单', '处理中', '已完成', '创建工单'];
+  const seriesData = statuses.map(status => {
+    return {
+      name: status,
+      type: 'bar',
+      emphasis: { focus: 'series' },
+      data: workOrder.map(item => item.statusCounts[status])
+    };
+  });
   myChart.setOption({
     tooltip: {},
+    legend: {
+      data: statuses,  // 图例数据，与series中的name对应
+      top: 10,         // 位置控制
+      textStyle: {
+        color: '#fff'
+      }
+    },
     grid: { left: 40, right: 20, top: 50, bottom: 25 },
-    xAxis: { data: ['A', 'B', 'C', 'D'] },
+    xAxis: { data: title ,axisLabel: { color: '#fff' },},
-    yAxis: {},
+    yAxis: {axisLabel: { color: '#fff' },},
-    series: [
+    series:seriesData,
-      {
-        name: '数量',
-        type: 'bar',
-        data: [5, 20, 36, 10, 10, 20],
-      },
-      {
-        name: '已处理',
-        type: 'bar',
-        data: [2, 10, 16, 3, 6, 8],
-      },
-      {
-        name: '待处理',
-        type: 'bar',
-        data: [3, 10, 20, 7, 4, 12],
-      },
-    ],
   });
 };
 
@@ -506,6 +584,8 @@ const changeToPersonnelDuty=()=>{
 
 // 组件挂载时初始化
 onMounted(() => {
+  getWarning()
+
   updateTime();
   timer = setInterval(updateTime, 1000);
   initBarChart();
@@ -551,6 +631,15 @@ onBeforeUnmount(() => {
 </script>
 
 <style scoped>
+.white-text-datepicker :deep(.ant-picker-input > input::placeholder) {
+  color: #fff !important;
+}
+.white-text-datepicker :deep(.ant-picker-input > input) {
+  color: white !important;
+}
+.white-text-datepicker :deep(.ant-picker-suffix > .anticon) {
+  color: white !important;
+}
 @font-face {
   font-family: 'ShiShangZhongHeiJianTi';
   src: url('../../../assets/fonts/时尚中黑简体.ttf') format('truetype');
@@ -707,6 +796,7 @@ onBeforeUnmount(() => {
           margin: 0 auto;
         }
         .bar-chart {
+          margin-top: 35px;
         }
       }
       .second {
@@ -835,6 +925,7 @@ onBeforeUnmount(() => {
       justify-content: space-between;
       .first {
         height: 16.81rem;
+        //background-color: red;
         .water-chart {
           height: 100%;
           /* margin-top: 0.2rem; */
@@ -845,13 +936,14 @@ onBeforeUnmount(() => {
         margin-top: 2rem;
         margin-bottom: 2rem;
         .second-box {
-          margin-top: 2rem;
+          margin-left: 0.5rem;
+          margin-top: 3.5rem;
           display: flex;
           justify-content: space-around;
           align-items: center;
           .box-content {
-            height: 8rem;
+            height: 7rem;
-            width: 8rem;
+            width: 7rem;
             display: flex;
             flex-direction: column;
             justify-content: center;
@@ -880,7 +972,38 @@ onBeforeUnmount(() => {
         }
       }
       .third {
+        padding: 5rem;
         height: 13.12rem;
+        display: flex;
+        justify-content: space-around;
+        align-items: center;
+        .third-item{
+          display: flex;
+          flex-direction: column;
+          justify-content: center;
+          align-items: center;
+          .third-title{
+            font-family: Microsoft YaHei;
+            font-weight: 400;
+            font-size: 0.8rem;
+            color: #c4d6ff;
+            line-height: 2rem;
+          }
+          .third-num{
+            display: flex;
+            justify-content: center;
+            align-items: center;
+            width: 6rem;
+            height: 4rem;
+            background: url('../../../assets/monitor/device-alerts-bg2.png');
+            background-size: 100% 100%;
+
+            font-family: Microsoft YaHei;
+            font-weight: 400;
+            font-size: 1.2rem;
+            color: #ffffff;
+          }
+        }
         .device-chart {
           height: 10rem;
           margin-top: 2rem;

apps/web-antd/src/views/system/role/data.tsx

@@ -24,12 +24,12 @@ export const querySchema: FormSchemaGetter = () => [
   {
     component: 'Input',
     fieldName: 'roleName',
-    label: '角色名称',
+    label: '账号',
   },
   {
     component: 'Input',
     fieldName: 'roleKey',
-    label: '权限字符',
+    label: '名称',
   },
   {
     component: 'Select',
@@ -49,11 +49,11 @@ export const querySchema: FormSchemaGetter = () => [
 export const columns: VxeGridProps['columns'] = [
   { type: 'checkbox', width: 60 },
   {
-    title: '角色名称',
+    title: '账号',
     field: 'roleName',
   },
   {
-    title: '权限字符',
+    title: '名称',
     field: 'roleKey',
     slots: {
       default: ({ row }) => {