diff --git a/apps/web-antd/src/api/property/attendanceManagement/arrangement/index.ts b/apps/web-antd/src/api/property/attendanceManagement/arrangement/index.ts
index 9a0df5c3..0ffab03b 100644
--- a/apps/web-antd/src/api/property/attendanceManagement/arrangement/index.ts
+++ b/apps/web-antd/src/api/property/attendanceManagement/arrangement/index.ts
@@ -7,21 +7,20 @@ import { commonExport } from '#/api/helper';
 import { requestClient } from '#/api/request';
 
 /**
-* 查询排班列表
+* 分页查询排班列表
 * @param params
 * @returns 排班列表
 */
 export function arrangementList(params?: ArrangementQuery) {
   return requestClient.get<PageResult<ArrangementVO>>('/property/arrangement/list', { params });
 }
-
 /**
- * 导出排班列表
+ * 根据月份查询排班列表
  * @param params
  * @returns 排班列表
  */
-export function arrangementExport(params?: ArrangementQuery) {
-  return commonExport('/property/arrangement/export', params ?? {});
+export function arrangementCalender(params?: ArrangementQuery) {
+  return requestClient.get<any>('/property/arrangement/explore', { params });
 }
 
 /**
diff --git a/apps/web-antd/src/api/property/attendanceManagement/arrangement/model.d.ts b/apps/web-antd/src/api/property/attendanceManagement/arrangement/model.d.ts
index ac3c65a8..83f93190 100644
--- a/apps/web-antd/src/api/property/attendanceManagement/arrangement/model.d.ts
+++ b/apps/web-antd/src/api/property/attendanceManagement/arrangement/model.d.ts
@@ -40,7 +40,6 @@ export interface ArrangementVO {
    * 状态：0-未生效，1-已生效
    */
   status: number;
-
 }
 
 export interface ArrangementForm extends BaseEntity {
@@ -83,7 +82,10 @@ export interface ArrangementForm extends BaseEntity {
    * 状态：0-未生效，1-已生效
    */
   status?: number;
-
+  /**
+   * 排班人员详情
+   */
+  userGroupList: any[];
 }
 
 export interface ArrangementQuery extends PageQuery {
@@ -123,7 +125,12 @@ export interface ArrangementQuery extends PageQuery {
   status?: number;
 
   /**
-    * 日期范围参数
-    */
+   * 日期范围参数
+   */
   params?: any;
+
+  /**
+   * 月份
+   */
+  month?: string;
 }
diff --git a/apps/web-antd/src/assets/digitalIntelligence/bg.png b/apps/web-antd/src/assets/digitalIntelligence/bg.png
index c0c998d5..13301915 100644
Binary files a/apps/web-antd/src/assets/digitalIntelligence/bg.png and b/apps/web-antd/src/assets/digitalIntelligence/bg.png differ
diff --git a/apps/web-antd/src/assets/energyConsumptionAnalysis/bg.png b/apps/web-antd/src/assets/energyConsumptionAnalysis/bg.png
index 40c8a453..d05d513a 100644
Binary files a/apps/web-antd/src/assets/energyConsumptionAnalysis/bg.png and b/apps/web-antd/src/assets/energyConsumptionAnalysis/bg.png differ
diff --git a/apps/web-antd/src/views/property/attendanceManagement/workforceManagement/arrangement-modal.vue b/apps/web-antd/src/views/property/attendanceManagement/workforceManagement/arrangement-modal.vue
index f1a0dd84..d4e5ccd3 100644
--- a/apps/web-antd/src/views/property/attendanceManagement/workforceManagement/arrangement-modal.vue
+++ b/apps/web-antd/src/views/property/attendanceManagement/workforceManagement/arrangement-modal.vue
@@ -34,12 +34,47 @@ const isUpdate = ref(false);
 const title = computed(() => {
   return isUpdate.value ? $t('pages.common.edit') : $t('pages.common.add');
 });
+//表单项
+let formModel = reactive<{
+  id: string;
+  groupId: string;
+  attendanceType: string;
+  dateType: number | undefined;
+  startDate: string;
+  endDate: string;
+  userGroupList: any[];
+}>({
+  id: '',
+  groupId: '',
+  attendanceType: '', //考勤组类型
+  dateType: undefined, //日期类型：1-单个日期，2-长期有效，3-期间有效
+  // dateSingle: null,
+  // dateLong: null,
+  // dateRange: [null, null],
+  startDate: '', //开始日期
+  endDate: '', //结束日期
+  userGroupList: [
+    // scheduleId:undefined,//排班ID
+    // employeeId:undefined,//员工ID
+    // employeeName:undefined,//员工姓名
+    // deptId:undefined,//部门ID
+    // deptName:undefined,//部门名称
+  ], //考勤组人员列表
+});
+const formRef = ref();
+let singleDate = ref(''); //排班日期单个日期
+let longDate = ref(''); //排班日期从此日起长期有效
+let rangeDate = ref(['', '']); //排班日期在此期间有效
+const rules = {
+  groupId: [{ required: true, message: '请选择考勤组' }],
+  attendanceType: [{ required: true }],
+  dateType: [{ required: true, message: '请选择排班日期' }],
+};
 const groupOptions = ref<any[]>([]);
 const groupMap = ref<Record<string, any>>({}); // 用于快速查找
-const tableData = reactive<
+let tableData = reactive<
   { dept: { unitId: string | number; unitName: string }; users: PersonVO[] }[]
->([]);
-
+>([]); //存放考勤组人员列表数据
 const columns = [
   {
     title: '序号',
@@ -108,44 +143,44 @@ function handleRemoveRow(index: number) {
 }
 
 function handleTableData(newTableData: any) {
-  tableData.splice(0, tableData.length, ...newTableData);
+  // 如果现有数据为空，直接替换
+  if (tableData.length === 0) {
+    tableData.splice(0, 0, ...newTableData);
+    return;
+  }
+
+  // 如果新数据为空，不做处理
+  if (newTableData.length === 0) {
+    return;
+  }
+
+  // 处理有数据的情况
+  for (const newItem of newTableData) {
+    // 查找是否已存在相同部门
+    const existingDeptIndex = tableData.findIndex(
+      (item) => item.dept.unitId === newItem.dept.unitId,
+    );
+
+    if (existingDeptIndex !== -1) {
+      // 找到相同部门，检查人员是否有重复
+      const existingDept = tableData[existingDeptIndex];
+      for (const newUser of newItem.users) {
+        // 检查该用户是否已存在
+        const userExists = existingDept?.users.some(
+          (existingUser) => existingUser.id === newUser.id,
+        );
+        if (!userExists) {
+          // 用户不存在，添加到现有部门
+          existingDept?.users.push(newUser);
+        }
+      }
+    } else {
+      // 部门不存在，直接添加新部门
+      tableData.push(newItem);
+    }
+  }
 }
-//表单项
-const formModel = reactive<{
-  id: string;
-  groupId: string;
-  attendanceType: string;
-  dateType: number | undefined;
-  startDate: string;
-  endDate: string;
-  userGroupList: any[];
-}>({
-  id: '',
-  groupId: '',
-  attendanceType: '', //考勤组类型
-  dateType: undefined, //日期类型：1-单个日期，2-长期有效，3-期间有效
-  // dateSingle: null,
-  // dateLong: null,
-  // dateRange: [null, null],
-  startDate: '', //开始日期
-  endDate: '', //结束日期
-  userGroupList: [
-    // scheduleId:undefined,//排班ID
-    // employeeId:undefined,//员工ID
-    // employeeName:undefined,//员工姓名
-    // deptId:undefined,//部门ID
-    // deptName:undefined,//部门名称
-  ], //考勤组人员列表
-});
-const singleDate = ref('');
-const longDate = ref('');
-const rangeDate = ref(['', '']);
-const formRef = ref();
-const rules = {
-  groupId: [{ required: true, message: '请选择考勤组' }],
-  attendanceType: [{ required: true }],
-  dateType: [{ required: true, message: '请选择排班日期' }],
-};
+
 const [BasicForm, formApi] = useVbenForm({
   commonConfig: {
     // 默认占满两列
@@ -173,7 +208,7 @@ const [UnitPersonModal, unitPersonmodalApi] = useVbenModal({
 });
 const [BasicModal, modalApi] = useVbenModal({
   // 在这里更改宽度
-  class: 'w-[70%]',
+  class: 'w-[85%]',
   fullscreenButton: false,
   onBeforeClose,
   onClosed: handleClosed,
@@ -183,7 +218,6 @@ const [BasicModal, modalApi] = useVbenModal({
       return null;
     }
     await getGroupList();
-    console.log(getDictOptions('wy_kqlx'));
     modalApi.modalLoading(true);
     const { id } = modalApi.getData() as { id?: number | string };
     isUpdate.value = !!id;
@@ -220,7 +254,6 @@ async function getGroupList() {
   });
 }
 function chooseGroup(value: any) {
-  console.log(value);
   const group = groupMap.value[value];
   if (group) {
     formModel.attendanceType = String(group.attendanceType);
@@ -232,12 +265,10 @@ async function handleDateTypeChange(value: any) {
 async function handleConfirm() {
   try {
     modalApi.lock(true);
-    // await formRef.value.validate(); // 先校验
+    await formRef.value.validate(); // 先校验
     const data = formModel;
     const { id } = modalApi.getData() as { id?: string };
     data.id = id ? id : '';
-    console.log(data);
-
     if (data.dateType == 1) {
       if (singleDate.value) {
         data.startDate = dayjs(singleDate.value).format('YYYY-MM-DD');
@@ -264,10 +295,36 @@ async function handleConfirm() {
         data.endDate = dayjs(rangeDate.value[1]).format('YYYY-MM-DD');
       }
     }
-    // await (isUpdate.value ? arrangementUpdate(data) : arrangementAdd(data));
+    for (const item of tableData) {
+      for (const user of item.users) {
+        data.userGroupList.push({
+          deptId: item.dept.unitId, //部门ID
+          deptName: item.dept.unitName, //部门名称
+          employeeId: user.id, //员工ID
+          employeeName: user.userName, //员工姓名
+        });
+      }
+    }
+    await (isUpdate.value ? arrangementUpdate(data) : arrangementAdd(data));
     resetInitialized();
     emit('reload');
+    // 重置表单数据
+    Object.assign(formModel, {
+      id: '',
+      groupId: '',
+      attendanceType: '',
+      dateType: undefined,
+      startDate: '',
+      endDate: '',
+      userGroupList: [],
+    });
+    // 重置其他数据
+    tableData.length = 0;
+    singleDate.value = '';
+    longDate.value = '';
+    rangeDate.value = ['', ''];
     modalApi.close();
+    await formApi.resetForm();
   } catch (error) {
     console.error(error);
   } finally {
@@ -276,8 +333,27 @@ async function handleConfirm() {
 }
 
 async function handleClosed() {
+  // 重置表单数据
+  Object.assign(formModel, {
+    id: '',
+    groupId: '',
+    attendanceType: '',
+    dateType: undefined,
+    startDate: '',
+    endDate: '',
+    userGroupList: [],
+  });
+
+  // 重置其他数据
+  tableData.length = 0;
+  singleDate.value = '';
+  longDate.value = '';
+  rangeDate.value = ['', ''];
+
+  // 重置表单状态
   await formApi.resetForm();
   resetInitialized();
+  modalApi.close();
 }
 onMounted(() => {});
 </script>
diff --git a/apps/web-antd/src/views/property/attendanceManagement/workforceManagement/calendarView.vue b/apps/web-antd/src/views/property/attendanceManagement/workforceManagement/calendarView.vue
index ea4b843d..774f9aa0 100644
--- a/apps/web-antd/src/views/property/attendanceManagement/workforceManagement/calendarView.vue
+++ b/apps/web-antd/src/views/property/attendanceManagement/workforceManagement/calendarView.vue
@@ -1,11 +1,13 @@
 <script lang="ts" setup>
-import { Radio, Button, Calendar, DatePicker } from 'ant-design-vue';
+import { Radio, Button, Calendar, DatePicker, message } from 'ant-design-vue';
 import type { RadioChangeEvent, BadgeProps } from 'ant-design-vue';
-import { ref } from 'vue';
+import { ref, onMounted, reactive } from 'vue';
 import { Dayjs } from 'dayjs';
+import dayjs from 'dayjs';
 import arrangementModal from './arrangement-modal.vue';
 import { useVbenModal } from '@vben/common-ui';
-import type { PersonVO } from './type';
+import { arrangementCalender } from '#/api/property/attendanceManagement/arrangement'; // 导入接口
+
 const emit = defineEmits<{
   (e: 'changeView', value: boolean): void;
 }>();
@@ -13,6 +15,57 @@ const props = defineProps<{
   viewMode: 'calender' | 'schedule';
 }>();
 const selectedDate = ref();
+const calendarData = reactive<any[]>([]);
+const loading = ref(false);
+// 查询日历数据
+const fetchCalendarData = async (month?: string) => {
+  try {
+    loading.value = true;
+    const params = {
+      month:
+        month ||
+        selectedDate.value?.format('YYYY-MM') ||
+        dayjs().format('YYYY-MM'),
+    };
+    const res = await arrangementCalender(params);
+    const currentMonth =
+      month ||
+      selectedDate.value?.format('YYYY-MM') ||
+      dayjs().format('YYYY-MM'); //当前月份的开始日期
+    // 生成日历渲染数据结构
+    for (const row of res.rows) {
+      if (row.endDate) {
+        //当开始时间小于当前月份的开始日期
+        if (row.startDate <= currentMonth) {
+          console.log(row, '小');
+
+          //如果结束时间小于当前月份的结束时间，则生成当前月份开始时间到row.endDate结束时间的n条数据
+          //如果结束时间大于等于当前月份的结束时间，则生成当前月份开始时间到当前月份结束时间（即当前月份天数）的n条数据
+        } else {
+          //当开始时间大于当前月份的开始日期
+          //如果结束时间小于当前月份的结束时间，则生成开始时间到结束时间的n条数据
+          console.log(row, '大');
+        }
+      } else {
+        calendarData.push({
+          data: row.startDate,
+          item: {
+            id: row.id,
+            groupName: row.attendanceGroup.groupName,
+            groupId: row.attendanceGroup.id,
+          },
+        });
+      }
+    }
+    // if (response) {
+    //   calendarData.value = response.data || [];
+    //   console.log('日历数据:', calendarData.value);
+    // }
+  } finally {
+    loading.value = false;
+  }
+};
+
 // 切换视图模式
 function handleViewModeChange(e: RadioChangeEvent): void {
   // 将父组件的isCalenderView变为true
@@ -28,13 +81,22 @@ const scheduleData: {
   { date: '2025-07-06', list: [{ type: 'success', content: '8月8日事件' }] },
   // ...
 ];
+
 const getListData2 = (
   current: Dayjs,
 ): { type: BadgeProps['status']; content: string }[] => {
   const dateStr = current.format('YYYY-MM-DD');
-  const found = scheduleData.find((item) => item.date === dateStr);
-  return found ? found.list : [];
+  // 优先使用接口数据
+  if (calendarData.length > 0) {
+    const found = calendarData.find((item) => item.date === dateStr);
+    if (found) {
+      return found.list || [];
+    }
+  }
+  // 如果没有找到数据，返回空数组
+  return [];
 };
+
 const getListData = (
   value: Dayjs,
 ): { type: BadgeProps['status']; content: string }[] => {
@@ -84,6 +146,11 @@ function handleAdd() {
   modalApi.setData({});
   modalApi.open();
 }
+
+// 页面初始化时加载数据
+onMounted(() => {
+  fetchCalendarData();
+});
 </script>
 <template>
   <div class="flex h-full flex-col">
@@ -98,7 +165,11 @@ function handleAdd() {
         </Radio.Group>
         <div class="my-auto flex gap-1">
           <div class="my-auto">排班日历</div>
-          <DatePicker picker="month" v-model:value="selectedDate" />
+          <DatePicker
+            picker="month"
+            v-model:value="selectedDate"
+            @change="fetchCalendarData()"
+          />
         </div>
       </div>
       <div>
@@ -110,6 +181,7 @@ function handleAdd() {
         v-model:value="selectedDate"
         :mode="'month'"
         :headerRender="customHeader"
+        :loading="loading"
       >
         <template #dateCellRender="{ current }">
           <ul class="events">
@@ -140,7 +212,7 @@ function handleAdd() {
         </template>
       </Calendar>
     </div>
-    <ArrangementModal @reload="" />
+    <ArrangementModal @reload="fetchCalendarData()" />
   </div>
 </template>
 <style scoped>
diff --git a/apps/web-antd/src/views/property/attendanceManagement/workforceManagement/unit-person-modal.vue b/apps/web-antd/src/views/property/attendanceManagement/workforceManagement/unit-person-modal.vue
index 2f503f04..d2b9a3b4 100644
--- a/apps/web-antd/src/views/property/attendanceManagement/workforceManagement/unit-person-modal.vue
+++ b/apps/web-antd/src/views/property/attendanceManagement/workforceManagement/unit-person-modal.vue
@@ -62,10 +62,10 @@ const deptTree = reactive<
 ]);
 
 //勾选内容
-const selectedUsers = ref<PersonVO[]>([]);
+let selectedUsers = ref<PersonVO[]>([]);
 //已选内容，需要展示到父组件
 
-const tableData = reactive<
+let tableData = reactive<
   {
     dept: { unitId: string | number; unitName: string };
     users: PersonVO[];
@@ -236,6 +236,8 @@ async function handleConfirm() {
     console.log(tableData);
     resetInitialized();
     emit('reload', tableData);
+    tableData = [];
+    selectedUsers.value =[];
     modalApi.close();
   } catch (error) {
     console.error(error);
diff --git a/apps/web-antd/src/views/property/clean/cleanOrders/clean-modal.vue b/apps/web-antd/src/views/property/clean/cleanOrders/clean-modal.vue
index 3091c3a0..34527570 100644
--- a/apps/web-antd/src/views/property/clean/cleanOrders/clean-modal.vue
+++ b/apps/web-antd/src/views/property/clean/cleanOrders/clean-modal.vue
@@ -23,8 +23,10 @@ import { resident_unitList } from '#/api/property/resident/unit';
 import { defaultFormValueGetter, useBeforeCloseDiff } from '#/utils/popup';
 
 import cleanDetailModal from './clean-detail-modal.vue';
-import { modalSchema } from './data';
+// import { modalSchema } from './data';
 import { communityTree } from '#/api/property/community';
+import { getDictOptions } from '#/utils/dict';
+
 const emit = defineEmits<{ reload: [] }>();
 
 // 计算合计费用
@@ -59,7 +61,142 @@ let unitListData: { id: any; name: string }[] = [];
 const editUnitId = ref('');
 const editCleanOrderId = ref('');
 const detailModal = ref(null);
-
+const modalSchema = [
+  {
+    label: '主键id',
+    fieldName: 'id',
+    component: 'Input',
+    dependencies: {
+      show: () => false,
+      triggerFields: [''],
+    },
+  },
+  {
+    label: '服务地址（房间号）',
+    component: 'TreeSelect',
+    defaultValue: undefined,
+    fieldName: 'location',
+    rules: 'required',
+  },
+  {
+    label: '开始时间',
+    fieldName: 'starTime',
+    component: 'DatePicker',
+    componentProps: {
+      showTime: true,
+      format: 'YYYY-MM-DD HH:mm:ss',
+      placeholder: '请选择开始时间',
+    },
+    rules: 'required',
+  },
+  {
+    label: '结束时间',
+    fieldName: 'endTime',
+    component: 'DatePicker',
+    componentProps: (values: any) => ({
+      showTime: true,
+      format: 'YYYY-MM-DD HH:mm:ss',
+      placeholder: !values.starTime
+        ? '请先选择开始时间'
+        : `请选择结束时间（结束时间不能早于开始时间）`,
+      disabled: isReadonly.value || !values.starTime, // 没选开始时间时禁用
+      disabledDate: (current: any) => {
+        if (!values.starTime) return false;
+        // 只允许选择大于等于开始时间的日期
+        return current && current < dayjs(values.starTime).startOf('second');
+      },
+    }),
+    rules: 'required',
+    dependencies: {
+      triggerFields: ['starTime'],
+    },
+  },
+  {
+    label: '申请人',
+    fieldName: 'persion',
+    component: 'Input',
+    rules: 'required',
+  },
+  {
+    label: '联系电话',
+    fieldName: 'phone',
+    component: 'Input',
+    rules: 'required',
+  },
+  {
+    label: '申请单位',
+    fieldName: 'unitId',
+    component: 'ApiSelect',
+    componentProps: {
+      api: resident_unitList,
+      resultField: 'rows',
+      labelField: 'name',
+      valueField: 'id',
+      placeholder: '请选择单位',
+    },
+    rules: 'required',
+  },
+  {
+    label: '支付状态',
+    fieldName: 'payState',
+    component: 'Select',
+    componentProps: {
+      options: [
+        {
+          label: '待支付',
+          value: 0,
+        },
+        {
+          label: '已支付',
+          value: 1,
+        },
+      ],
+    },
+    rules: 'required',
+  },
+  {
+    label: '保洁类型',
+    fieldName: 'type',
+    component: 'Select',
+    componentProps: {
+      options: getDictOptions('pro_cleaning_type'),
+    },
+    rules: 'selectRequired',
+  },
+  {
+    label: '评价',
+    fieldName: 'serviceEvalua',
+    component: 'Rate',
+    componentProps: {
+      allowHalf: false,
+      count: 5,
+      tooltips: ['1星', '2星', '3星', '4星', '5星'],
+      defaultValue: 0,
+    },
+    dependencies: {
+      show: () => (isReadonly.value ? true : false),
+      triggerFields: [''],
+    },
+  },
+  {
+    label: '评价文本',
+    fieldName: 'serviceEvaluaText',
+    component: 'Input',
+    dependencies: {
+      show: () => (isReadonly.value ? true : false),
+      triggerFields: [''],
+    },
+  },
+  {
+    label: '联系电话',
+    fieldName: 'imgUrl',
+    component: 'Input',
+    dependencies: {
+      show: () => (isReadonly.value ? true : false),
+      triggerFields: [''],
+    },
+  },
+];
 const [BasicForm, formApi] = useVbenForm({
   commonConfig: {
     // 默认占满两列
@@ -71,7 +208,6 @@ const [BasicForm, formApi] = useVbenForm({
       class: 'w-full',
       disabled: isReadonly.value,
     })),
-    schema: modalSchema(isReadonly.value),
   },
   // 1. 使用正确的属性名 handleValuesChange
   handleValuesChange: async (values, fieldsChanged) => {
@@ -103,7 +239,10 @@ const [BasicForm, formApi] = useVbenForm({
       }
     }
   },
-  schema: modalSchema(),
+  // schema: computed(() => {
+  //   modalSchema(isReadonly.value);
+  // }),
+  schema: modalSchema,
   showDefaultActions: false,
   wrapperClass: 'grid-cols-2',
 });
@@ -126,6 +265,8 @@ const [BasicModal, modalApi] = useVbenModal({
     if (!isOpen) {
       return null;
     }
+    console.log(isReadonly.value);
+
     // 查询服务地址树形结构
     setupCommunitySelect();
     modalApi.modalLoading(true);
@@ -372,6 +513,8 @@ async function handleClosed() {
 // 获取服务地址
 async function setupCommunitySelect() {
   const areaList = await communityTree(4);
+  console.log(areaList);
+
   // 选中后显示在输入框的值 即父节点 / 子节点
   // addFullName(areaList, 'areaName', ' / ');
   const splitStr = '/';
diff --git a/apps/web-antd/src/views/property/clean/cleanOrders/data.ts b/apps/web-antd/src/views/property/clean/cleanOrders/data.ts
index 59d3a06d..b23abae7 100644
--- a/apps/web-antd/src/views/property/clean/cleanOrders/data.ts
+++ b/apps/web-antd/src/views/property/clean/cleanOrders/data.ts
@@ -5,10 +5,10 @@ import { resident_unitList } from '#/api/property/resident/unit';
 import { useCleanStore } from '#/store';
 import type { FormSchema } from '../../../../../../../packages/@core/ui-kit/form-ui/src/types';
 import dayjs from 'dayjs';
-import {h} from "vue";
-import {Rate} from "ant-design-vue";
-import {getDictOptions} from "#/utils/dict";
-import {renderDict} from "#/utils/render";
+import { h } from 'vue';
+import { Rate } from 'ant-design-vue';
+import { getDictOptions } from '#/utils/dict';
+import { renderDict } from '#/utils/render';
 const cleanStore = useCleanStore();
 
 export const querySchema: (areaList: any[]) => FormSchema[] = (areaList) => [
@@ -120,7 +120,7 @@ export const columns: VxeGridProps['columns'] = [
     field: 'type',
     width: 180,
     slots: {
-      default: ({row}) => {
+      default: ({ row }) => {
         return renderDict(row.type, 'pro_cleaning_type');
       },
     },
@@ -130,7 +130,7 @@ export const columns: VxeGridProps['columns'] = [
     field: 'serviceEvalua',
     width: 180,
     slots: {
-      default: ({row}) => {
+      default: ({ row }) => {
         return h(Rate, {
           value: row.serviceEvalua || 0,
           disabled: true,
@@ -153,12 +153,13 @@ export const columns: VxeGridProps['columns'] = [
     fixed: 'right',
     slots: { default: 'action' },
     title: '操作',
-    width:'200'
+    width: '200',
   },
-
 ];
 
-export const modalSchema: (isReadonly: boolean) => FormSchema[] = (isReadonly) => [
+export const modalSchema: (isReadonly: boolean) => FormSchema[] = (
+  isReadonly,
+) => [
   {
     label: '主键id',
     fieldName: 'id',
@@ -193,9 +194,11 @@ export const modalSchema: (isReadonly: boolean) => FormSchema[] = (isReadonly) =
     componentProps: (values) => ({
       showTime: true,
       format: 'YYYY-MM-DD HH:mm:ss',
-      placeholder: !values.starTime?'请先选择开始时间':`请选择结束时间（结束时间不能早于开始时间）`,
+      placeholder: !values.starTime
+        ? '请先选择开始时间'
+        : `请选择结束时间（结束时间不能早于开始时间）`,
       disabled: isReadonly || !values.starTime, // 没选开始时间时禁用
-      disabledDate: (current:any) => {
+      disabledDate: (current: any) => {
         if (!values.starTime) return false;
         // 只允许选择大于等于开始时间的日期
         return current && current < dayjs(values.starTime).startOf('second');
@@ -266,8 +269,29 @@ export const modalSchema: (isReadonly: boolean) => FormSchema[] = (isReadonly) =
       allowHalf: false,
       count: 5,
       tooltips: ['1星', '2星', '3星', '4星', '5星'],
-      defaultValue: 0
+      defaultValue: 0,
+    },
+    dependencies: {
+      show: () => (isReadonly ? true : false),
+      triggerFields: [''],
+    },
+  },
+  {
+    label: '评价文本',
+    fieldName: 'serviceEvaluaText',
+    component: 'Input',
+    dependencies: {
+      show: () => (isReadonly ? true : false),
+      triggerFields: [''],
+    },
+  },
+  {
+    label: '联系电话',
+    fieldName: 'imgUrl',
+    component: 'Input',
+    dependencies: {
+      show: () => (isReadonly ? true : false),
+      triggerFields: [''],
     },
-    rules: 'required',
   },
 ];
diff --git a/apps/web-antd/src/views/property/clean/cleanOrders/index.vue b/apps/web-antd/src/views/property/clean/cleanOrders/index.vue
index c1757190..7c3c1d8d 100644
--- a/apps/web-antd/src/views/property/clean/cleanOrders/index.vue
+++ b/apps/web-antd/src/views/property/clean/cleanOrders/index.vue
@@ -135,7 +135,6 @@ function handleView(row: Required<CleanForm>) {
 function handleAudit(row: any) {
   // 审核逻辑
   // TODO: 实现审核功能
-  console.log('审核', row);
   modalApi.setData({ id: row.id, readonly: true, audit: true, row: row });
   modalApi.open();
 }
@@ -143,7 +142,6 @@ function handleAudit(row: any) {
 function handleRefund(row: any) {
   // 退定逻辑
   // TODO: 实现退定功能
-  console.log('退定', row);
   modalApi.setData({ id: row.id, readonly: true, refund: true, row: row });
   modalApi.open();
 }
diff --git a/apps/web-antd/src/views/property/costManagement/carCharge/carCharge-add.vue b/apps/web-antd/src/views/property/costManagement/carCharge/carCharge-add.vue
index 64450454..8ce96e9f 100644
--- a/apps/web-antd/src/views/property/costManagement/carCharge/carCharge-add.vue
+++ b/apps/web-antd/src/views/property/costManagement/carCharge/carCharge-add.vue
@@ -7,7 +7,7 @@ import { carChargeAdd } from '#/api/property/carCharge';
 import { defaultFormValueGetter, useBeforeCloseDiff } from '#/utils/popup';
 import { addModalSchema } from './data';
 import { communityTree } from '#/api/property/community';
-import { cloneDeep,handleNode,getPopupContainer } from '@vben/utils';
+import { cloneDeep, handleNode, getPopupContainer } from '@vben/utils';
 
 const emit = defineEmits<{ reload: [] }>();
 
@@ -41,11 +41,11 @@ const [BasicModal, modalApi] = useVbenModal({
   onConfirm: handleConfirm,
   onOpenChange: async (isOpen) => {
     if (!isOpen) return null;
-    setupCommunitySelect()
+    setupCommunitySelect();
     modalApi.modalLoading(true);
     await formApi.resetForm();
     await markInitialized();
-    await formApi.setValues({costType:'2'});
+    await formApi.setValues({ costType: '2' });
     modalApi.modalLoading(false);
   },
 });
@@ -72,12 +72,12 @@ async function handleClosed() {
   resetInitialized();
 }
 async function setupCommunitySelect() {
-  const areaList = await communityTree(4);
+  const areaList = await communityTree(3);
   // 选中后显示在输入框的值 即父节点 / 子节点
   // addFullName(areaList, 'areaName', ' / ');
   const splitStr = '/';
   handleNode(areaList, 'label', splitStr, function (node: any) {
-    if (node.level != 4) {
+    if (node.level != 3) {
       node.disabled = true;
     }
   });
@@ -112,7 +112,7 @@ async function setupCommunitySelect() {
   <BasicModal :title="title">
     <BasicForm />
   </BasicModal>
-</template> 
+</template>
 
 <style scoped>
 /* 使用 :deep() 穿透 scoped 样式，影响子组件 */
@@ -126,4 +126,4 @@ async function setupCommunitySelect() {
   /* 有些浏览器需要这个来覆盖默认颜色 */
   -webkit-text-fill-color: rgb(0 0 0 / 65%) !important;
 }
-</style>
\ No newline at end of file
+</style>
diff --git a/apps/web-antd/src/views/property/costManagement/costMeterWater/costMeterWater-modal.vue b/apps/web-antd/src/views/property/costManagement/costMeterWater/costMeterWater-modal.vue
index f64606a6..7da7dabe 100644
--- a/apps/web-antd/src/views/property/costManagement/costMeterWater/costMeterWater-modal.vue
+++ b/apps/web-antd/src/views/property/costManagement/costMeterWater/costMeterWater-modal.vue
@@ -111,7 +111,6 @@ const schema = [
           itemId: '',
           meterTypeId: '',
         });
-        console.log(await formApi.getValues());
       },
     },
   },
@@ -216,8 +215,6 @@ const [BasicModal, modalApi] = useVbenModal({
     isUpdate.value = !!id;
     if (isUpdate.value && id) {
       const record = await costMeterWaterInfo(id);
-      console.log(1, record);
-
       const costItemsRes = await costItemSettingList({
         pageSize: 1000000000,
         pageNum: 1,
@@ -253,7 +250,6 @@ const [BasicModal, modalApi] = useVbenModal({
         },
       ]);
       await formApi.setValues(record);
-      console.log(2, await formApi.getValues());
     }
     await markInitialized();
 
@@ -270,8 +266,6 @@ async function handleConfirm() {
     }
     // getValues获取为一个readonly的对象 需要修改必须先深拷贝一次
     const data = cloneDeep(await formApi.getValues());
-    console.log(data);
-
     await (isUpdate.value
       ? costMeterWaterUpdate(data)
       : costMeterWaterAdd(data));
diff --git a/apps/web-antd/src/views/property/personalCenter/leaveApplication/data.ts b/apps/web-antd/src/views/property/personalCenter/leaveApplication/data.ts
index 5c6286bf..b75bac23 100644
--- a/apps/web-antd/src/views/property/personalCenter/leaveApplication/data.ts
+++ b/apps/web-antd/src/views/property/personalCenter/leaveApplication/data.ts
@@ -4,146 +4,6 @@ import type { VxeGridProps } from '#/adapter/vxe-table';
 import { getDictOptions } from '#/utils/dict';
 import { renderDict } from '#/utils/render';
 
-export const querySchema: FormSchemaGetter = () => [
-  {
-    component: 'Input',
-    fieldName: 'userId',
-    label: '用户ID，关联用户表',
-  },
-  {
-    component: 'Input',
-    fieldName: 'username',
-    label: '申请人姓名',
-  },
-  {
-    component: 'Input',
-    fieldName: 'departmentId',
-    label: '部门ID，关联部门表',
-  },
-  {
-    component: 'Input',
-    fieldName: 'departmentName',
-    label: '部门名称',
-  },
-  {
-    component: 'Select',
-    componentProps: {
-    },
-    fieldName: 'leaveType',
-    label: '请假类型',
-  },
-  {
-    component: 'DatePicker',
-    componentProps: {
-      showTime: true,
-      format: 'YYYY-MM-DD HH:mm:ss',
-      valueFormat: 'YYYY-MM-DD HH:mm:ss',
-    },
-    fieldName: 'startTime',
-    label: '开始时间',
-  },
-  {
-    component: 'DatePicker',
-    componentProps: {
-      showTime: true,
-      format: 'YYYY-MM-DD HH:mm:ss',
-      valueFormat: 'YYYY-MM-DD HH:mm:ss',
-    },
-    fieldName: 'endTime',
-    label: '结束时间',
-  },
-  {
-    component: 'Input',
-    fieldName: 'totalDuration',
-    label: '合计时间，如3天5个小时',
-  },
-  {
-    component: 'Textarea',
-    fieldName: 'reason',
-    label: '请假事由',
-  },
-  {
-    component: 'Select',
-    componentProps: {
-      // 可选从DictEnum中获取 DictEnum.WY_SQZT 便于维护
-      options: getDictOptions('wy_sqzt'),
-    },
-    fieldName: 'status',
-    label: '申请状态',
-  },
-  {
-    component: 'Input',
-    fieldName: 'searchValue',
-    label: '搜索值',
-  },
-];
-
-// 需要使用i18n注意这里要改成getter形式 否则切换语言不会刷新
-// export const columns: () => VxeGridProps['columns'] = () => [
-export const columns: VxeGridProps['columns'] = [
-  { type: 'checkbox', width: 60 },
-  {
-    title: '',
-    field: 'id',
-  },
-  {
-    title: '用户ID，关联用户表',
-    field: 'userId',
-  },
-  {
-    title: '申请人姓名',
-    field: 'username',
-  },
-  {
-    title: '部门ID，关联部门表',
-    field: 'departmentId',
-  },
-  {
-    title: '部门名称',
-    field: 'departmentName',
-  },
-  {
-    title: '请假类型',
-    field: 'leaveType',
-  },
-  {
-    title: '开始时间',
-    field: 'startTime',
-  },
-  {
-    title: '结束时间',
-    field: 'endTime',
-  },
-  {
-    title: '合计时间，如3天5个小时',
-    field: 'totalDuration',
-  },
-  {
-    title: '请假事由',
-    field: 'reason',
-  },
-  {
-    title: '申请状态',
-    field: 'status',
-    slots: {
-      default: ({ row }) => {
-        // 可选从DictEnum中获取 DictEnum.WY_SQZT 便于维护
-        return renderDict(row.status, 'wy_sqzt');
-      },
-    },
-  },
-  {
-    title: '搜索值',
-    field: 'searchValue',
-  },
-  {
-    field: 'action',
-    fixed: 'right',
-    slots: { default: 'action' },
-    title: '操作',
-    width: 180,
-  },
-];
 
 export const modalSchema: FormSchemaGetter = () => [
   {
@@ -156,24 +16,16 @@ export const modalSchema: FormSchemaGetter = () => [
     },
   },
   {
-    label: '用户ID，关联用户表',
-    fieldName: 'userId',
-    component: 'Input',
-  },
-  {
-    label: '申请人姓名',
+    label: '姓名',
     fieldName: 'username',
     component: 'Input',
+    rules:'required'
   },
   {
-    label: '部门ID，关联部门表',
+    label: '部门',
     fieldName: 'departmentId',
-    component: 'Input',
-  },
-  {
-    label: '部门名称',
-    fieldName: 'departmentName',
-    component: 'Input',
+    component: 'ApiSelect',
+    rules:'required'
   },
   {
     label: '请假类型',
@@ -181,6 +33,7 @@ export const modalSchema: FormSchemaGetter = () => [
     component: 'Select',
     componentProps: {
     },
+    rules:'required'
   },
   {
     label: '开始时间',
@@ -191,6 +44,8 @@ export const modalSchema: FormSchemaGetter = () => [
       format: 'YYYY-MM-DD HH:mm:ss',
       valueFormat: 'YYYY-MM-DD HH:mm:ss',
     },
+    rules:'required'
+
   },
   {
     label: '结束时间',
@@ -201,29 +56,19 @@ export const modalSchema: FormSchemaGetter = () => [
       format: 'YYYY-MM-DD HH:mm:ss',
       valueFormat: 'YYYY-MM-DD HH:mm:ss',
     },
+    rules:'required'
   },
   {
-    label: '合计时间，如3天5个小时',
+    label: '合计时间',
     fieldName: 'totalDuration',
     component: 'Input',
+    disabled:true,
+    rules:'required'
   },
   {
     label: '请假事由',
     fieldName: 'reason',
     component: 'Textarea',
-  },
-  {
-    label: '申请状态',
-    fieldName: 'status',
-    component: 'Select',
-    componentProps: {
-      // 可选从DictEnum中获取 DictEnum.WY_SQZT 便于维护
-      options: getDictOptions('wy_sqzt'),
-    },
-  },
-  {
-    label: '搜索值',
-    fieldName: 'searchValue',
-    component: 'Input',
-  },
+    rules:'required'
+  }
 ];
diff --git a/apps/web-antd/src/views/property/personalCenter/leaveApplication/index.vue b/apps/web-antd/src/views/property/personalCenter/leaveApplication/index.vue
index 3c24b6a0..8bba1c88 100644
--- a/apps/web-antd/src/views/property/personalCenter/leaveApplication/index.vue
+++ b/apps/web-antd/src/views/property/personalCenter/leaveApplication/index.vue
@@ -1,188 +1,39 @@
 <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 {
-  useVbenVxeGrid,
-  vxeCheckboxChecked,
-  type VxeGridProps,
-} from '#/adapter/vxe-table';
-
 import {
   leaveApplicationExport,
   leaveApplicationList,
   leaveApplicationRemove,
 } from '#/api/property/personalCenter/leaveApplication';
 import type { LeaveApplicationForm } from '#/api/property/personalCenter/leaveApplication/model';
-import { commonDownloadExcel } from '#/utils/file/download';
 
-import leaveApplicationModal from './leaveApplication-modal.vue';
-import { columns, querySchema } from './data';
+import { useVbenForm } from '#/adapter/form';
+import {  useVbenModal} from '@vben/common-ui';
+import {modalSchema} from "./data";
+import { useVModel } from '@vueuse/core';
 
-const formOptions: VbenFormProps = {
+const [BasicForm, formApi] = useVbenForm({
   commonConfig: {
-    labelWidth: 80,
+    formItemClass: 'col-span-1',
+    // 默认label宽度 px
+    labelWidth: 160,
+    // 通用配置项 会影响到所有表单项
     componentProps: {
-      allowClear: true,
+      class: 'w-full',
     },
   },
-  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 leaveApplicationList({
-          pageNum: page.currentPage,
-          pageSize: page.pageSize,
-          ...formValues,
-        });
-      },
-    },
-  },
-  rowConfig: {
-    keyField: 'id',
-  },
-  // 表格全局唯一表示 保存列配置需要用到
-  id: 'property-leaveApplication-index',
-};
-
-const [BasicTable, tableApi] = useVbenVxeGrid({
-  formOptions,
-  gridOptions,
+  schema: modalSchema(),
+  showDefaultActions: false,
+  wrapperClass: 'grid-cols-2 gap-x-10 gap-y-2',
 });
-
-const [LeaveApplicationModal, modalApi] = useVbenModal({
-  connectedComponent: leaveApplicationModal,
-});
-
-function handleAdd() {
-  modalApi.setData({});
-  modalApi.open();
-}
-
-async function handleEdit(row: Required<LeaveApplicationForm>) {
-  modalApi.setData({ id: row.id });
-  modalApi.open();
-}
-
-async function handleDelete(row: Required<LeaveApplicationForm>) {
-  await leaveApplicationRemove(row.id);
-  await tableApi.query();
-}
-
-function handleMultiDelete() {
-  const rows = tableApi.grid.getCheckboxRecords();
-  const ids = rows.map((row: Required<LeaveApplicationForm>) => row.id);
-  Modal.confirm({
-    title: '提示',
-    okType: 'danger',
-    content: `确认删除选中的${ids.length}条记录吗？`,
-    onOk: async () => {
-      await leaveApplicationRemove(ids);
-      await tableApi.query();
-    },
-  });
-}
-
-function handleDownloadExcel() {
-  commonDownloadExcel(
-    leaveApplicationExport,
-    '请假申请数据',
-    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:leaveApplication:export']"
-            @click="handleDownloadExcel"
-          >
-            {{ $t('pages.common.export') }}
-          </a-button>
-          <a-button
-            :disabled="!vxeCheckboxChecked(tableApi)"
-            danger
-            type="primary"
-            v-access:code="['property:leaveApplication:remove']"
-            @click="handleMultiDelete"
-          >
-            {{ $t('pages.common.delete') }}
-          </a-button>
-          <a-button
-            type="primary"
-            v-access:code="['property:leaveApplication:add']"
-            @click="handleAdd"
-          >
-            {{ $t('pages.common.add') }}
-          </a-button>
-        </Space>
-      </template>
-      <template #action="{ row }">
-        <Space>
-          <ghost-button
-            v-access:code="['property:leaveApplication: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:leaveApplication:remove']"
-              @click.stop=""
-            >
-              {{ $t('pages.common.delete') }}
-            </ghost-button>
-          </Popconfirm>
-        </Space>
-      </template>
-    </BasicTable>
-    <LeaveApplicationModal @reload="tableApi.query()" />
-  </Page>
+  <div class="p-8">
+    <div class="text-2xl font-bold">请假申请</div>
+    <div class="m-6 bg-white p-4">
+        <BasicForm/>
+    </div>
+  </div>
 </template>
diff --git a/apps/web-antd/src/views/property/personalCenter/leaveApplication/leaveApplication-modal.vue b/apps/web-antd/src/views/property/personalCenter/leaveApplication/leaveApplication-modal.vue
deleted file mode 100644
index c052f188..00000000
--- a/apps/web-antd/src/views/property/personalCenter/leaveApplication/leaveApplication-modal.vue
+++ /dev/null
@@ -1,106 +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 {
-  leaveApplicationAdd,
-  leaveApplicationInfo,
-  leaveApplicationUpdate,
-} from '#/api/property/personalCenter/leaveApplication';
-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 leaveApplicationInfo(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
-      ? leaveApplicationUpdate(data)
-      : leaveApplicationAdd(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/src/views/property/resident/unit/data.ts b/apps/web-antd/src/views/property/resident/unit/data.ts
index f78ea30f..a7ac0cae 100644
--- a/apps/web-antd/src/views/property/resident/unit/data.ts
+++ b/apps/web-antd/src/views/property/resident/unit/data.ts
@@ -130,7 +130,6 @@ export const modalSchema: FormSchemaGetter = () => [
     fieldName: 'name',
     component: 'Input',
     rules: 'required',
-
   },
   {
     label: '单位类型',
diff --git a/apps/web-antd/src/views/screen/digitalIntelligence/index.vue b/apps/web-antd/src/views/screen/digitalIntelligence/index.vue
index 7f971bfc..4e3d5213 100644
--- a/apps/web-antd/src/views/screen/digitalIntelligence/index.vue
+++ b/apps/web-antd/src/views/screen/digitalIntelligence/index.vue
@@ -1,394 +1,548 @@
 <template>
-    <div class="mian">
-        <div class="title">
-            <div class="left">
-                <div class="left-first" id="time">--:--:--</div>
-                <div class="left-second" id="date">----</div>
+  <div class="mian">
+    <div class="title">
+      <div class="left">
+        <div class="left-first" id="time">--:--:--</div>
+        <div class="left-second" id="date">----</div>
+      </div>
+      <div class="center">南川区商务中心数智管理平台</div>
+      <div class="right">
+        <div>{{ weekDay }}</div>
+        <div>晴</div>
+        <div>40℃</div>
+        <div class="logout" @click="logout">
+          <img
+            src="../../../assets/return.png"
+            style="width: 1.5rem; height: 1.5rem"
+          />
+          <div>退出</div>
+        </div>
+      </div>
+    </div>
+    <div class="contents">
+      <div class="content">
+        <div class="content-left">
+          <div class="first">
+            <div class="first-content1">
+              <div>746</div>
+              <div>214</div>
+              <div>456</div>
             </div>
-            <div class="center">南川区商务中心数智管理平台</div>
-            <div class="right">
-                <div>{{ weekDay }}</div>
-                <div>晴</div>
-                <div>40℃</div>
-                <div class="logout" @click="logout">
-                <img src="../../../assets/return.png" style="width: 1.5rem; height: 1.5rem;">
-                <div>
-                退出
-                </div>
+            <div class="first-content2">
+              <div ref="pieChart" class="pie-chart"></div>
+            </div>
+          </div>
+          <div class="second">
+            <div class="second-content">
+              <div ref="powerChart" class="power-chart"></div>
+            </div>
+          </div>
+          <div class="third">
+            <div class="third-content">
+              <div class="content1">
+                <div>13312</div>
+                <div>133</div>
+                <div>133</div>
+                <div>133</div>
+              </div>
+              <div class="content2">
+                <div
+                  class="device-throughput-chart"
+                  ref="deviceThroughputChart"
+                ></div>
               </div>
             </div>
+          </div>
         </div>
-        <div class="contents">
-            <div class="content">
-                <div class="content-left">
-                    <div class="first">
-                      <div class="first-content1">
-                        <div>746</div>
-                        <div>214</div>
-                        <div>456</div>
-                      </div>
-                      <div class="first-content2">
-                         <div ref="pieChart" class="pie-chart"></div>
-                       </div>
-                    </div>
-                    <div class="second">
-                        <div class="second-content">
-                            <div ref="powerChart" class="power-chart"></div>
-                        </div>
-                    </div>
-                    <div class="third">
-                      <div class="third-content">
-                        <div class="content1">
-                          <div>13312</div>
-                          <div>133</div>
-                          <div>133</div>
-                          <div>133</div>
-                        </div>
-                        <div class="content2">
-                          <div class="device-throughput-chart" ref="deviceThroughputChart"></div>
-                        </div>
-                      </div>
-                    </div>
-                </div>
-                <div class="content-center">
-                  <div class="first">
-                    <div>3946</div>
-                    <div>6538</div>
-                    <div>2627</div>
-                    <div>3978</div>
-                  </div>
-                  <div class="second"></div>
-                </div>
-                <div class="content-right">
-                    <div class="first">
-                      <div class="first-content1">
-                        <div ref="lineChart" class="line-chart"></div>
-                      </div>
-                      <div class="first-content2">
-                        <div ref="lineChart2" class="line-chart"></div>
-                      </div>
-                    </div>
-                    <div class="second">
-                      <div class="second-box">
-                        <div class="content1">
-                          <div>637</div>
-                          <div class="content-title">待处理</div>
-                        </div>
-                        <div class="content2">
-                          <div>637</div>
-                          <div class="content-title">已处理</div>
-                        </div>
-                        <div class="content2">
+        <div class="content-center">
+          <div class="first">
+            <div>3946</div>
+            <div>6538</div>
+            <div>2627</div>
+            <div>3978</div>
+          </div>
+          <div class="second"></div>
+        </div>
+        <div class="content-right">
+          <div class="first">
+            <div class="radio">
+              <Radio.Group v-model:value="timeUnit" @change="handleViewModeChange">
+                    <Radio.Button value=1>时</Radio.Button>
+                    <Radio.Button value=2>日</Radio.Button>
+                    <Radio.Button value=3>月</Radio.Button>
+              </Radio.Group>
+            </div>
+            <div class="content-box">
+              <div class="first-content1">
+               <div ref="lineChart" class="line-chart"></div>
+              </div>
+              <div class="first-content2">
+               <div ref="lineChart2" class="line-chart"></div>
+              </div>
+            </div>
+          </div>
+          <div class="second">
+            <div class="second-box">
+              <div class="content1" @click="changeToworkOrderPending">
+                <div>637</div>
+                <div class="content-title">待处理</div>
+              </div>
+              <div class="content2" @click="changeToWorkOrder">
+                <div>637</div>
+                <div class="content-title">已处理</div>
+              </div>
+              <!-- <div class="content2">
                           <div>637</div>
                           <div class="content-title">已拒绝</div>
                         </div>
                         <div class="content4">
                            <div>637</div>
                           <div class="content-title">待审核</div>
-                        </div>
-                      </div>
-                    </div>
-                    <div class="third">
-                      <div class="device-cards">
-                          <div class="device-card1">
-                            <div>
-                              <img src="../../../assets/energyConsumptionAnalysis/devices-number-icon.png" style="width: 1.75rem;height: 1.75rem;" alt="">
-                            </div>
-                            <div class="device-card-text-box">
-                              <div class="device-card-text">设备总数</div>
-                              <div class="device-card1-value">650</div>
-                            </div>
-                          </div>
-                          <div class="device-card2">
-                            <div>
-                              <img src="../../../assets/energyConsumptionAnalysis/devices-online-icon.png" style="width: 1.75rem;height: 1.75rem;" alt="">
-                            </div>
-                            <div>
-                              <div class="device-card-text">设备在线数</div>
-                              <div class="device-card2-value">632</div>
-                            </div>
-                          </div>
-                          <div class="device-card3">
-                            <div>
-                              <img src="../../../assets/energyConsumptionAnalysis/devices-offline-icon.png" style="width: 1.75rem;height: 1.75rem;" alt="">
-                            </div>
-                            <div>
-                              <div class="device-card-text">设备离线数</div>
-                              <div class="device-card3-value">18</div>
-                            </div>
-                          </div>
-                        </div>
-                        <div ref="deviceChart" class="device-chart"></div>
-                    </div>
-                </div>
+                        </div> -->
             </div>
+          </div>
+          <div class="third">
+            <div class="device-cards">
+              <div class="device-card1">
+                <div>
+                  <img
+                    src="../../../assets/energyConsumptionAnalysis/devices-number-icon.png"
+                    style="width: 1.75rem; height: 1.75rem"
+                    alt=""
+                  />
+                </div>
+                <div class="device-card-text-box">
+                  <div class="device-card-text">设备总数</div>
+                  <div class="device-card1-value">650</div>
+                </div>
+              </div>
+              <div class="device-card2">
+                <div>
+                  <img
+                    src="../../../assets/energyConsumptionAnalysis/devices-online-icon.png"
+                    style="width: 1.75rem; height: 1.75rem"
+                    alt=""
+                  />
+                </div>
+                <div>
+                  <div class="device-card-text">设备在线数</div>
+                  <div class="device-card2-value">632</div>
+                </div>
+              </div>
+              <div class="device-card3">
+                <div>
+                  <img
+                    src="../../../assets/energyConsumptionAnalysis/devices-offline-icon.png"
+                    style="width: 1.75rem; height: 1.75rem"
+                    alt=""
+                  />
+                </div>
+                <div>
+                  <div class="device-card-text">设备离线数</div>
+                  <div class="device-card3-value">18</div>
+                </div>
+              </div>
+            </div>
+            <div ref="deviceChart" class="device-chart"></div>
+          </div>
         </div>
+      </div>
     </div>
+  </div>
 </template>
 
 <script setup lang="ts">
-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'
-useFlexibleRem()
+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 { Radio } from 'ant-design-vue';
+
+const timeUnit = ref('1');
+
+// 不同时间单位的数据
+const timeData = {
+  hour: {
+    xAxis: Array.from({ length: 24 }, (_, i) => i.toString()), // 完整的24小时数据
+    data1: [19, 45, 67, 89, 120, 156, 189, 234, 278, 315, 356, 398, 445, 489, 534, 578, 623, 667, 712, 756, 801, 845, 890, 934],
+    data2: [23, 52, 78, 95, 134, 167, 198, 245, 289, 326, 367, 409, 456, 500, 545, 589, 634, 678, 723, 767, 812, 856, 901, 945]
+  },
+  day: {
+    xAxis: Array.from({ length: 31 }, (_, i) => (i + 1).toString()), // 完整的31天数据
+    data1: [1200, 1350, 1480, 1620, 1780, 1950, 2130, 2320, 2510, 2710, 2910, 3120, 3340, 3560, 3790, 4020, 4260, 4500, 4750, 5000, 5260, 5520, 5790, 6060, 6340, 6620, 6910, 7200, 7500, 7800, 8100],
+    data2: [1100, 1250, 1380, 1520, 1680, 1850, 2030, 2220, 2410, 2610, 2810, 3020, 3240, 3460, 3690, 3920, 4160, 4400, 4650, 4900, 5160, 5420, 5690, 5960, 6240, 6520, 6810, 7100, 7400, 7700, 8000]
+  },
+  month: {
+    xAxis: ['1月', '2月', '3月', '4月', '5月', '6月', '7月', '8月', '9月', '10月', '11月', '12月'],
+    data1: [45000, 52000, 48000, 61000, 58000, 65000, 72000, 68000, 75000, 82000, 78000, 85000],
+    data2: [42000, 49000, 45000, 58000, 55000, 62000, 69000, 65000, 72000, 79000, 75000, 82000]
+  }
+};
+
+useFlexibleRem();
 // 路由
-const router = useRouter()
+const router = useRouter();
 
 // 图表实例
-const barChart = ref<HTMLElement>()
-const powerChart = ref<HTMLElement>()
-const envChart = ref<HTMLElement>()
-const waterChart = ref<HTMLElement>()
-const deviceChart = ref<HTMLElement>()
-const pie3dChart = ref<HTMLElement>()
-const pieChart = ref<HTMLElement>()
-const deviceThroughputChart = ref<HTMLElement>()
-const lineChart = ref<HTMLElement>()
-const lineChart2 = ref<HTMLElement>()
+const barChart = ref<HTMLElement>();
+const powerChart = ref<HTMLElement>();
+const envChart = ref<HTMLElement>();
+const waterChart = ref<HTMLElement>();
+const deviceChart = ref<HTMLElement>();
+const pie3dChart = ref<HTMLElement>();
+const pieChart = ref<HTMLElement>();
+const deviceThroughputChart = ref<HTMLElement>();
+const lineChart = ref<HTMLElement>();
+const lineChart2 = ref<HTMLElement>();
 
 // 定时器
-let timer: number | null = null
+let timer: NodeJS.Timeout | null = null;
 
 // 星期几
-const weekDay = ref('')
+const weekDay = ref('');
 
 // 图表实例
-let barChartInstance: echarts.ECharts | null = null
-let powerChartInstance: echarts.ECharts | null = null
-let envChartInstance: echarts.ECharts | null = null
-let waterChartInstance: echarts.ECharts | null = null
-let deviceChartInstance: echarts.ECharts | null = null
-let pie3dChartInstance: any = null
-let pieChartInstance: echarts.ECharts | null = null
-let deviceThroughputChartInstance: echarts.ECharts | null = null
-let lineChartInstance: echarts.ECharts | null = null
-let lineChart2Instance: echarts.ECharts | null = null
+let barChartInstance: echarts.ECharts | null = null;
+let powerChartInstance: echarts.ECharts | null = null;
+let envChartInstance: echarts.ECharts | null = null;
+let waterChartInstance: echarts.ECharts | null = null;
+let deviceChartInstance: echarts.ECharts | null = null;
+let pie3dChartInstance: any = null;
+let pieChartInstance: echarts.ECharts | null = null;
+let deviceThroughputChartInstance: echarts.ECharts | null = null;
+let lineChartInstance: echarts.ECharts | null = null;
+let lineChart2Instance: echarts.ECharts | null = null;
 
-const category = ['金山镇','骑龙乡','鱼泉乡','石墙镇','铁村乡'];
-const lineData = [18092,20728,24045,28348,32808];
-const barData = [4600,5000,5500,6500,7500];
+const category = ['金山镇', '骑龙乡', '鱼泉乡', '石墙镇', '铁村乡'];
+const lineData = [18092, 20728, 24045, 28348, 32808];
+const barData = [4600, 5000, 5500, 6500, 7500];
 const rateData = barData.map((v, i) => (v / lineData[i]).toFixed(2));
 
+// 处理时间单位切换
+const handleViewModeChange = (e: any) => {
+  const unit = e.target.value;
+  let dataKey: 'hour' | 'day' | 'month' = 'hour';
+  
+  if (unit === '2') {
+    dataKey = 'day';
+  } else if (unit === '3') {
+    dataKey = 'month';
+  }
+  
+  // 更新图表数据
+  updateLineCharts(dataKey);
+};
+
+// 更新曲线图数据
+const updateLineCharts = (dataKey: 'hour' | 'day' | 'month') => {
+  const data = timeData[dataKey];
+  
+  if (!data) return;
+  
+  // 根据时间单位设置不同的标签显示策略
+  const labelConfig = {
+    hour: { interval: 2, rotate: 0, fontSize: 12 }, // 小时：每隔2个显示一个标签
+    day: { interval: 4, rotate: 0, fontSize: 11 }, // 日：每隔4个显示一个标签
+    month: { interval: 0, rotate: 0, fontSize: 12 } // 月：显示所有标签
+  };
+  
+  if (lineChartInstance) {
+    const option = lineChartInstance.getOption() as any;
+    if (option.xAxis && option.xAxis[0]) {
+      option.xAxis[0].data = data.xAxis;
+      option.xAxis[0].axisLabel = {
+        ...option.xAxis[0].axisLabel,
+        ...labelConfig[dataKey]
+      };
+    }
+    if (option.series && option.series[0]) {
+      option.series[0].data = data.data1;
+    }
+    lineChartInstance.setOption(option);
+  }
+  
+  if (lineChart2Instance) {
+    const option = lineChart2Instance.getOption() as any;
+    if (option.xAxis && option.xAxis[0]) {
+      option.xAxis[0].data = data.xAxis;
+      option.xAxis[0].axisLabel = {
+        ...option.xAxis[0].axisLabel,
+        ...labelConfig[dataKey]
+      };
+    }
+    if (option.series && option.series[0]) {
+      option.series[0].data = data.data2;
+    }
+    lineChart2Instance.setOption(option);
+  }
+};
+
 const lineChartOption = {
-  backgroundColor: new echarts.graphic.LinearGradient(0, 0, 0, 1, [
-  { offset: 0, color: 'rgba(200,101,137,0.2)' },
-  { offset: 1, color: 'rgba(6,167,255,0.2)' }
-], false),
-    grid: {
-        top: '25%',
-        left: '5%',
-        right: '5%',
-        bottom: '0%',
-        containLabel: true,
+  
+  backgroundColor: new echarts.graphic.LinearGradient(
+    0,
+    0,
+    0,
+    1,
+    [
+      { offset: 0, color: 'rgba(200,101,137,0.2)' },
+      { offset: 1, color: 'rgba(6,167,255,0.2)' },
+    ],
+    false,
+  ),
+  tooltip: { trigger: 'axis' },
+  grid: {
+    top: '20%',
+    left: '5%',
+    right: '5%',
+    bottom: '0',
+    containLabel: true,
+  },
+  xAxis: {
+    type: 'category',
+    boundaryGap: false,
+    data: timeData.hour.xAxis,
+    axisLabel: {
+      margin: 30,
+      color: '#ffffff63',
+      interval: 2, // 每隔2个显示一个标签
+      rotate: 0, // 不旋转标签
+      fontSize: 12, // 设置字体大小
     },
-    xAxis: {
-        type: 'category',
-        boundaryGap: false,
-        data: ['0','4',  '8',  '12',  '16',  '20', '23'],
-        axisLabel: {
-            margin: 30,
-            color: '#ffffff63'
-        },
-        axisLine: {
-            show: false
-        },
-        axisTick: {
-            show: true,
-            length: 25,
-            lineStyle: {
-                color: "#ffffff1f"
-            }
-        },
-        splitLine: {
-            show: true,
-            lineStyle: {
-                color: '#ffffff1f'
-            }
-        }
+    axisLine: {
+      show: false,
     },
-    yAxis: [{
-        type: 'value',
-        position: 'right',
-        // axisTick: {
-        //     show: true,
-        //     length: 15,
-        //     lineStyle: {
-        //         color: "#ffffff1f",
-        //     }
-        // },
-        splitLine: {
-            show: false,
-            lineStyle: {
-                color: '#ffffff1f'
-            }
-        },
-        axisLine: {
-          show:false,
-          lineStyle: {
-              color: '#fff',
-              width: 2
-          }
-        },
-        axisLabel:{
-          show:false
-        }
-    }],
-    series: [{
-        name: '',
-        type: 'line',
-        smooth: true, //是否平滑曲线显示
-        showAllSymbol: true,
-        symbol: 'circle',
-        symbolSize: 6,
+    axisTick: {
+      show: true,
+      length: 25,
+      lineStyle: {
+        color: '#ffffff1f',
+      },
+    },
+    splitLine: {
+      show: true,
+      lineStyle: {
+        color: '#ffffff1f',
+      },
+    },
+  },
+  yAxis: [
+    {
+      type: 'value',
+      position: 'right',
+      // axisTick: {
+      //     show: true,
+      //     length: 15,
+      //     lineStyle: {
+      //         color: "#ffffff1f",
+      //     }
+      // },
+      splitLine: {
+        show: false,
         lineStyle: {
-            normal: {
-                color: "#fff", // 线条颜色
-            },
+          color: '#ffffff1f',
         },
-        label: {
-            show: true,
-            // position: 'top',
-            textStyle: {
-                color: '#fff',
-            }
+      },
+      axisLine: {
+        show: false,
+        lineStyle: {
+          color: '#fff',
+          width: 2,
         },
-        itemStyle: {
-            color: "red",
-            borderColor: "#fff",
-            borderWidth: 3
+      },
+      axisLabel: {
+        show: false,
+      },
+    },
+  ],
+  series: [
+    {
+      name: '',
+      type: 'line',
+      smooth: true, //是否平滑曲线显示
+      showAllSymbol: true,
+      symbol: 'circle',
+      symbolSize: 6,
+      lineStyle: {
+        normal: {
+          color: '#fff', // 线条颜色
         },
-        tooltip: {
-            show: false
+      },
+      label: {
+        show: false,
+        // position: 'top',
+        textStyle: {
+          color: '#fff',
         },
-        areaStyle: {
-            normal: {
-                color: new echarts.graphic.LinearGradient(0, 0, 0, 1, [{
-                        offset: 0,
-                        color: '#eb64fb'
-                    },
-                    {
-                        offset: 1,
-                        color: '#3fbbff0d'
-                    }
-                ], false),
-            }
+      },
+      itemStyle: {
+        color: 'red',
+        borderColor: '#fff',
+        borderWidth: 3,
+      },
+      // tooltip: {
+      //   show: false,
+      // },
+      areaStyle: {
+        normal: {
+          color: new echarts.graphic.LinearGradient(
+            0,
+            0,
+            0,
+            1,
+            [
+              {
+                offset: 0,
+                color: '#eb64fb',
+              },
+              {
+                offset: 1,
+                color: '#3fbbff0d',
+              },
+            ],
+            false,
+          ),
         },
-        data: [19, 238, 985, 631, 1889,924,339]
-    }]
+      },
+      data: timeData.hour.data1,
+    },
+  ],
 };
 const lineChart2Option = {
-  backgroundColor: new echarts.graphic.LinearGradient(0, 0, 0, 1, [
-  { offset: 0, color: 'rgba(200,101,137,0.2)' },
-  { offset: 1, color: 'rgba(6,167,255,0.2)' }
-], false),
-    grid: {
-        top: '25%',
-        left: '5%',
-        right: '5%',
-        bottom: '0%',
-        containLabel: true,
+  backgroundColor: new echarts.graphic.LinearGradient(
+    0,
+    0,
+    0,
+    1,
+    [
+      { offset: 0, color: 'rgba(200,101,137,0.2)' },
+      { offset: 1, color: 'rgba(6,167,255,0.2)' },
+    ],
+    false,
+  ),
+  tooltip: { trigger: 'axis' },
+  grid: {
+    top: '25%',
+    left: '5%',
+    right: '5%',
+    bottom: '0%',
+    containLabel: true,
+  },
+  xAxis: {
+    type: 'category',
+    boundaryGap: false,
+    data: timeData.hour.xAxis,
+    axisLabel: {
+      margin: 30,
+      color: '#ffffff63',
+      interval: 2, // 每隔2个显示一个标签
+      rotate: 0, // 不旋转标签
+      fontSize: 12, // 设置字体大小
     },
-    xAxis: {
-        type: 'category',
-        boundaryGap: false,
-        data: ['0','4',  '8',  '12',  '16',  '20', '23'],
-        axisLabel: {
-            margin: 30,
-            color: '#ffffff63'
-        },
-        axisLine: {
-            show: false
-        },
-        axisTick: {
-            show: true,
-            length: 25,
-            lineStyle: {
-                color: "#ffffff1f"
-            }
-        },
-        splitLine: {
-            show: true,
-            lineStyle: {
-                color: '#ffffff1f'
-            }
-        }
+    axisLine: {
+      show: false,
     },
-    yAxis: [{
-        type: 'value',
-        position: 'right',
-        axisLabel: {
-          show:false,
-            margin: 20,
-            color: '#ffffff63'
-        },
+    axisTick: {
+      show: true,
+      length: 25,
+      lineStyle: {
+        color: '#ffffff1f',
+      },
+    },
+    splitLine: {
+      show: true,
+      lineStyle: {
+        color: '#ffffff1f',
+      },
+    },
+  },
+  yAxis: [
+    {
+      type: 'value',
+      position: 'right',
+      axisLabel: {
+        show: false,
+        margin: 20,
+        color: '#ffffff63',
+      },
 
-        axisTick: {
-            show: true,
-            length: 15,
-            lineStyle: {
-                color: "#ffffff1f",
-            }
-        },
-        splitLine: {
-            show: false,
-            lineStyle: {
-                color: '#ffffff1f'
-            }
-        },
-        axisLine: {
-            lineStyle: {
-                color: '#fff',
-                width: 2
-            }
-        }
-    }],
-    series: [{
-        name: '',
-        type: 'line',
-        smooth: true, //是否平滑曲线显示
-        showAllSymbol: true,
-        symbol: 'circle',
-        symbolSize: 6,
+      axisTick: {
+        show: true,
+        length: 15,
         lineStyle: {
-            normal: {
-                color: "#fff", // 线条颜色
-            },
+          color: '#ffffff1f',
         },
-        label: {
-            show: true,
-            // position: 'top',
-            textStyle: {
-                color: '#fff',
-            }
+      },
+      splitLine: {
+        show: false,
+        lineStyle: {
+          color: '#ffffff1f',
         },
-        itemStyle: {
-            color: "red",
-            borderColor: "#fff",
-            borderWidth: 3
+      },
+      axisLine: {
+        lineStyle: {
+          color: '#fff',
+          width: 2,
         },
-        tooltip: {
-            show: false
+      },
+    },
+  ],
+  series: [
+    {
+      name: '',
+      type: 'line',
+      smooth: true, //是否平滑曲线显示
+      showAllSymbol: true,
+      symbol: 'circle',
+      symbolSize: 6,
+      lineStyle: {
+        normal: {
+          color: '#fff', // 线条颜色
         },
-        areaStyle: {
-            normal: {
-                color: new echarts.graphic.LinearGradient(0, 0, 0, 1, [{
-                        offset: 0,
-                        color: '#eb64fb'
-                    },
-                    {
-                        offset: 1,
-                        color: '#3fbbff0d'
-                    }
-                ], false),
-            }
+      },
+      label: {
+        show: false,
+        // position: 'top',
+        textStyle: {
+          color: '#fff',
         },
-        data: [23, 78, 785, 431, 739, 924,439]
-    }]
+      },
+      itemStyle: {
+        color: 'red',
+        borderColor: '#fff',
+        borderWidth: 3,
+      },
+      areaStyle: {
+        normal: {
+          color: new echarts.graphic.LinearGradient(
+            0,
+            0,
+            0,
+            1,
+            [
+              {
+                offset: 0,
+                color: '#eb64fb',
+              },
+              {
+                offset: 1,
+                color: '#3fbbff0d',
+              },
+            ],
+            false,
+          ),
+        },
+      },
+      data: timeData.hour.data2,
+    },
+  ],
 };
 const deviceThroughputOption = {
   // title: {
@@ -408,43 +562,43 @@ const deviceThroughputOption = {
       type: 'shadow',
       label: {
         show: true,
-      }
-    }
+      },
+    },
   },
   legend: {
-    data: ['用量', '总量','使用率'],
+    data: ['用量', '总量', '使用率'],
     textStyle: {
-      color: '#B4B4B4'
+      color: '#B4B4B4',
     },
-    top:'0',
+    top: '0',
   },
-  grid:{
-    left:'12%',
-    width:'78%',
-    top:'15%',
-    bottom:'15%',
-    right:'30%',
+  grid: {
+    left: '12%',
+    width: '78%',
+    top: '15%',
+    bottom: '15%',
+    right: '30%',
   },
   xAxis: {
     data: category,
     axisLine: {
       lineStyle: {
-        color: '#B4B4B4'
-      }
+        color: '#B4B4B4',
+      },
     },
-    axisTick:{ show:false },
+    axisTick: { show: false },
   },
   yAxis: [
     {
-      splitLine: {show: false},
+      splitLine: { show: false },
       axisLine: { lineStyle: { color: '#B4B4B4' } },
-      axisLabel:{ formatter:'{value} ' }
+      axisLabel: { formatter: '{value} ' },
     },
     {
-      splitLine: {show: false},
+      splitLine: { show: false },
       axisLine: { lineStyle: { color: '#B4B4B4' } },
-      axisLabel:{ formatter:'{value} ' }
-    }
+      axisLabel: { formatter: '{value} ' },
+    },
   ],
   series: [
     {
@@ -455,8 +609,8 @@ const deviceThroughputOption = {
       symbol: 'emptyCircle',
       symbolSize: 8,
       yAxisIndex: 1,
-      itemStyle: { color:'#F02FC2' },
-      data: rateData
+      itemStyle: { color: '#F02FC2' },
+      data: rateData,
     },
     {
       name: '用量',
@@ -465,16 +619,13 @@ const deviceThroughputOption = {
       itemStyle: {
         normal: {
           barBorderRadius: 5,
-          color: new echarts.graphic.LinearGradient(
-            0, 0, 0, 1,
-            [
-              {offset: 0, color: '#956FD4'},
-              {offset: 1, color: '#3EACE5'}
-            ]
-          )
-        }
+          color: new echarts.graphic.LinearGradient(0, 0, 0, 1, [
+            { offset: 0, color: '#956FD4' },
+            { offset: 1, color: '#3EACE5' },
+          ]),
+        },
       },
-      data: barData
+      data: barData,
     },
     {
       name: '总量',
@@ -484,169 +635,208 @@ const deviceThroughputOption = {
       itemStyle: {
         normal: {
           barBorderRadius: 5,
-          color: new echarts.graphic.LinearGradient(
-            0, 0, 0, 1,
-            [
-              {offset: 0, color: 'rgba(156,107,211,0.5)'},
-              {offset: 0.2, color: 'rgba(156,107,211,0.3)'},
-              {offset: 1, color: 'rgba(156,107,211,0)'}
-            ]
-          )
-        }
+          color: new echarts.graphic.LinearGradient(0, 0, 0, 1, [
+            { offset: 0, color: 'rgba(156,107,211,0.5)' },
+            { offset: 0.2, color: 'rgba(156,107,211,0.3)' },
+            { offset: 1, color: 'rgba(156,107,211,0)' },
+          ]),
+        },
       },
       z: -12,
-      data: lineData
-    }
-  ]
-}
+      data: lineData,
+    },
+  ],
+};
 
 // 退出方法
 const logout = () => {
-  router.push('/navigation')
-}
+  router.push('/navigation');
+};
 
 // 更新时间
 const updateTime = () => {
-  const now = new Date()
-  const time = now.toLocaleTimeString('zh-CN', { hour12: false })
-  const date = now.getFullYear() + '.' +
-    String(now.getMonth() + 1).padStart(2, '0') + '.' +
-    String(now.getDate()).padStart(2, '0')
+  const now = new Date();
+  const time = now.toLocaleTimeString('zh-CN', { hour12: false });
+  const date =
+    now.getFullYear() +
+    '.' +
+    String(now.getMonth() + 1).padStart(2, '0') +
+    '.' +
+    String(now.getDate()).padStart(2, '0');
 
   // 获取星期几
-  const weekDays = ['日', '一', '二', '三', '四', '五', '六']
-  weekDay.value = '星期' + weekDays[now.getDay()]
+  const weekDays = ['日', '一', '二', '三', '四', '五', '六'];
+  weekDay.value = '星期' + weekDays[now.getDay()];
 
-  const timeElement = document.getElementById('time')
-  const dateElement = document.getElementById('date')
+  const timeElement = document.getElementById('time');
+  const dateElement = document.getElementById('date');
 
-  if (timeElement) timeElement.innerText = time
-  if (dateElement) dateElement.innerText = date
-}
+  if (timeElement) timeElement.innerText = time;
+  if (dateElement) dateElement.innerText = date;
+};
 // 初始化饼图
 const initPieChart = () => {
-  if (!pieChart.value) return
+  if (!pieChart.value) return;
   const m2R2Data = [
-    {value:335, legendname:'设备预警',name:"设备预警",itemStyle:{color:"#01A2F3"}},
-    {value:310, legendname:'其他预警',name:"其他预警",itemStyle:{color:"#A564F8"}},
-    {value:234, legendname:'客户报障',name:"客户报障",itemStyle:{color:"#54E6CB"}},
-    {value:154, legendname:'设备故障',name:"设备故障",itemStyle:{color:"#F8976A "}},
-  ]
-  const chart = echarts.init(pieChart.value)
+    {
+      value: 335,
+      legendname: '设备预警',
+      name: '设备预警',
+      itemStyle: { color: '#01A2F3' },
+    },
+    {
+      value: 310,
+      legendname: '其他预警',
+      name: '其他预警',
+      itemStyle: { color: '#A564F8' },
+    },
+    {
+      value: 234,
+      legendname: '客户报障',
+      name: '客户报障',
+      itemStyle: { color: '#54E6CB' },
+    },
+    {
+      value: 154,
+      legendname: '设备故障',
+      name: '设备故障',
+      itemStyle: { color: '#F8976A ' },
+    },
+  ];
+  const chart = echarts.init(pieChart.value);
   const option = {
     tooltip: {
       trigger: 'item',
-      formatter:function (parms: any){
-        var str=  parms.seriesName+"</br>"+
-          parms.marker+""+parms.data.legendname+"</br>"+
-          "数量："+ parms.data.value+"</br>"+
-          "占比："+ parms.percent+"%";
-        return  str ;
-      }
+      formatter: function (parms: any) {
+        var str =
+          parms.seriesName +
+          '</br>' +
+          parms.marker +
+          '' +
+          parms.data.legendname +
+          '</br>' +
+          '数量：' +
+          parms.data.value +
+          '</br>' +
+          '占比：' +
+          parms.percent +
+          '%';
+        return str;
+      },
     },
     legend: {
-      type:"scroll",
+      type: 'scroll',
       orient: 'vertical',
-      left:'70%',
-      align:'left',
-      top:'middle',
+      left: '70%',
+      align: 'left',
+      top: 'middle',
       textStyle: {
-        color:'#fff'
+        color: '#fff',
       },
-      height:250
+      height: 250,
     },
     series: [
       {
-        name:'标题',
-        type:'pie',
+        name: '标题',
+        type: 'pie',
         center: ['35%', '50%'],
         radius: '65%',
         clockwise: false, //饼图的扇区是否是顺时针排布
         avoidLabelOverlap: false,
-        data:m2R2Data
-      }
-    ]
-  }
-  chart.setOption(option)
-  pieChartInstance = chart
-  addChartToResizeManager(chart)
-}
+        data: m2R2Data,
+      },
+    ],
+  };
+  chart.setOption(option);
+  pieChartInstance = chart;
+  addChartToResizeManager(chart);
+};
 // 初始化柱状图
 const initBarChart = () => {
-  if (!barChart.value) return
+  if (!barChart.value) return;
 
-  const chart = echarts.init(barChart.value)
+  const chart = echarts.init(barChart.value);
   const option = getThreeDBarOption({
     xData: ['A区', 'B区', 'C区', 'D区'],
-    yData: [320, 452, 688, 400]
-  })
-  chart.setOption(option)
-  barChartInstance = chart
-  addChartToResizeManager(chart)
-}
+    yData: [320, 452, 688, 400],
+  });
+  chart.setOption(option);
+  barChartInstance = chart;
+  addChartToResizeManager(chart);
+};
 
 // 初始化电力图表
 const initPowerChart = () => {
-  if (!powerChart.value) return
+  if (!powerChart.value) return;
 
-  const chart = echarts.init(powerChart.value)
+  const chart = echarts.init(powerChart.value);
   const option = {
     tooltip: { trigger: 'axis' },
     grid: { left: 40, right: 20, top: 40, bottom: 30 },
     xAxis: {
       type: 'category',
-      data: Array.from({length: 19}, (_, i) => i + 6),
+      data: Array.from({ length: 19 }, (_, i) => i + 6),
       axisLine: { lineStyle: { color: '#3ec6ff' } },
-      axisLabel: { color: '#fff' }
+      axisLabel: { color: '#fff' },
     },
     yAxis: {
       type: 'value',
       name: '',
       axisLine: { lineStyle: { color: '#3ec6ff' } },
       axisLabel: { color: '#fff' },
-      splitLine: { lineStyle: { color: '#1e90ff22' } }
+      splitLine: { lineStyle: { color: '#1e90ff22' } },
     },
-    series: [{
-      data: [80, 120, 100, 130, 150, 180, 200, 220, 250, 285, 230, 200, 180, 150, 120, 100, 80, 60, 40],
-      type: 'line',
-      smooth: true,
-      symbol: 'circle',
-      symbolSize: 0,
-      itemStyle: { color: '#3ec6ff' },
-      lineStyle: { width: 1 },
-      areaStyle: { color: new echarts.graphic.LinearGradient(
-            0, 0, 0, 1, // 上→下
+    series: [
+      {
+        data: [
+          80, 120, 100, 130, 150, 180, 200, 220, 250, 285, 230, 200, 180, 150,
+          120, 100, 80, 60, 40,
+        ],
+        type: 'line',
+        smooth: true,
+        symbol: 'circle',
+        symbolSize: 0,
+        itemStyle: { color: '#3ec6ff' },
+        lineStyle: { width: 1 },
+        areaStyle: {
+          color: new echarts.graphic.LinearGradient(
+            0,
+            0,
+            0,
+            1, // 上→下
             [
               { offset: 0, color: '#32B7E9' },
-              { offset: 1, color: 'rgba(50,183,233,0)' }
-            ]
-            ), }
-    }]
-  }
-  chart.setOption(option)
-  powerChartInstance = chart
-  addChartToResizeManager(chart)
-}
+              { offset: 1, color: 'rgba(50,183,233,0)' },
+            ],
+          ),
+        },
+      },
+    ],
+  };
+  chart.setOption(option);
+  powerChartInstance = chart;
+  addChartToResizeManager(chart);
+};
 
 // 初始化环境图表
 const initEnvChart = () => {
-  if (!envChart.value) return
+  if (!envChart.value) return;
 
-  const chart = echarts.init(envChart.value)
+  const chart = echarts.init(envChart.value);
   const option = {
     tooltip: { trigger: 'axis' },
     grid: { left: 40, right: 20, top: 10, bottom: 20 },
     xAxis: {
       type: 'category',
-      data: Array.from({length: 8}, (_, i) => (i+1)*3),
+      data: Array.from({ length: 8 }, (_, i) => (i + 1) * 3),
       axisLine: { lineStyle: { color: '#3ec6ff' } },
-      axisLabel: { color: '#fff' }
+      axisLabel: { color: '#fff' },
     },
     yAxis: {
       type: 'value',
       axisLine: { lineStyle: { color: '#3ec6ff' } },
       axisLabel: { color: '#fff' },
-      splitLine: { lineStyle: { color: '#1e90ff22' } }
+      splitLine: { lineStyle: { color: '#1e90ff22' } },
     },
     series: [
       {
@@ -670,57 +860,65 @@ const initEnvChart = () => {
         areaStyle: { color: 'rgba(255,179,0,0.15)' },
         symbol: 'circle',
         symbolSize: 0,
-      }
-    ]
-  }
-  chart.setOption(option)
-  envChartInstance = chart
-  addChartToResizeManager(chart)
-}
+      },
+    ],
+  };
+  chart.setOption(option);
+  envChartInstance = chart;
+  addChartToResizeManager(chart);
+};
 
 // 初始化水表图表
 const initWaterChart = () => {
-  if (!waterChart.value) return
+  if (!waterChart.value) return;
 
-  const chart = echarts.init(waterChart.value)
+  const chart = echarts.init(waterChart.value);
   const option = {
     tooltip: { trigger: 'axis' },
     legend: {
       data: ['今日', '平均'],
       textStyle: { color: '#fff' },
       right: 20,
-      top: 10
+      top: 10,
     },
     grid: { left: 40, right: 20, top: 40, bottom: 30 },
     xAxis: {
       type: 'category',
-      data: Array.from({length: 19}, (_, i) => i + 6),
+      data: Array.from({ length: 19 }, (_, i) => i + 6),
       axisLine: { lineStyle: { color: '#3ec6ff' } },
-      axisLabel: { color: '#fff' }
+      axisLabel: { color: '#fff' },
     },
     yAxis: {
       type: 'value',
       axisLine: { lineStyle: { color: '#3ec6ff' } },
       axisLabel: { color: '#fff' },
-      splitLine: { lineStyle: { color: '#1e90ff22' } }
+      splitLine: { lineStyle: { color: '#1e90ff22' } },
     },
     series: [
       {
         name: '今日',
-        data: [1.2, 2.1, 1.8, 2.5, 3.0, 3.8, 4.2, 4.5, 4.8, 4.8, 4.0, 3.2, 2.5, 2.0, 1.5, 1.0, 0.8, 0.5, 0.2],
+        data: [
+          1.2, 2.1, 1.8, 2.5, 3.0, 3.8, 4.2, 4.5, 4.8, 4.8, 4.0, 3.2, 2.5, 2.0,
+          1.5, 1.0, 0.8, 0.5, 0.2,
+        ],
         type: 'line',
         smooth: true,
         symbol: 'circle',
         symbolSize: 0,
         itemStyle: { color: '#3ec6ff' },
         lineStyle: { width: 1 },
-        areaStyle: { color: new echarts.graphic.LinearGradient(
-              0, 0, 0, 1, // 上→下
-              [
-                { offset: 0, color: '#32B7E9' },
-                { offset: 1, color: 'rgba(50,183,233,0)' }
-              ]
-              ), }
+        areaStyle: {
+          color: new echarts.graphic.LinearGradient(
+            0,
+            0,
+            0,
+            1, // 上→下
+            [
+              { offset: 0, color: '#32B7E9' },
+              { offset: 1, color: 'rgba(50,183,233,0)' },
+            ],
+          ),
+        },
       },
       {
         name: '平均',
@@ -729,33 +927,33 @@ const initWaterChart = () => {
         smooth: true,
         symbol: 'none',
         itemStyle: { color: '#ff6b00' },
-        lineStyle: { width: 1, type: 'solid', color: '#ff6b00' }
-      }
-    ]
-  }
-  chart.setOption(option)
-  waterChartInstance = chart
-  addChartToResizeManager(chart)
-}
+        lineStyle: { width: 1, type: 'solid', color: '#ff6b00' },
+      },
+    ],
+  };
+  chart.setOption(option);
+  waterChartInstance = chart;
+  addChartToResizeManager(chart);
+};
 
 // 初始化设备图表
 const initDeviceChart = () => {
-  if (!deviceChart.value) return
+  if (!deviceChart.value) return;
 
-  const chart = echarts.init(deviceChart.value)
+  const chart = echarts.init(deviceChart.value);
   const option = {
     grid: { left: 60, right: 40, top: 10, bottom: 30 },
     xAxis: {
       type: 'value',
       axisLine: { lineStyle: { color: '#8697BA' } },
       axisLabel: { color: '#fff' },
-      splitLine: { show: false }
+      splitLine: { show: false },
     },
     yAxis: {
       type: 'category',
       data: ['门禁', '监控', '水表'],
       axisLine: { lineStyle: { color: '#8697BA' } },
-      axisLabel: { color: '#A1B2C2' }
+      axisLabel: { color: '#A1B2C2' },
     },
     series: [
       {
@@ -764,49 +962,58 @@ const initDeviceChart = () => {
         data: [650, 120, 40],
         barWidth: 12,
         itemStyle: {
-          color: function(params: any) {
+          color: function (params: any) {
             const colors = [
-            new echarts.graphic.LinearGradient(
-            0, 0, 0, 1, // 上→下
-            [
-              { offset: 0, color: '#2986B1' },
-              { offset: 1, color: '#6941FF' }
-            ]
-            ),
-            new echarts.graphic.LinearGradient(
-            0, 0, 0, 1, // 上→下
-            [
-              { offset: 0, color: '#33FF99' },
-              { offset: 1, color: '#00908E' }
-            ]
-            ),
-            new echarts.graphic.LinearGradient(
-            0, 0, 0, 1, // 上→下
-            [
-              { offset: 0, color: '#01B4FF' },
-              { offset: 1, color: '#0336FF' }
-            ]
-            ),
-          ];
-            return colors[params.dataIndex]
-          }
+              new echarts.graphic.LinearGradient(
+                0,
+                0,
+                0,
+                1, // 上→下
+                [
+                  { offset: 0, color: '#2986B1' },
+                  { offset: 1, color: '#6941FF' },
+                ],
+              ),
+              new echarts.graphic.LinearGradient(
+                0,
+                0,
+                0,
+                1, // 上→下
+                [
+                  { offset: 0, color: '#33FF99' },
+                  { offset: 1, color: '#00908E' },
+                ],
+              ),
+              new echarts.graphic.LinearGradient(
+                0,
+                0,
+                0,
+                1, // 上→下
+                [
+                  { offset: 0, color: '#01B4FF' },
+                  { offset: 1, color: '#0336FF' },
+                ],
+              ),
+            ];
+            return colors[params.dataIndex];
+          },
         },
         label: {
           show: true,
           position: 'right',
-          color: '#fff'
-        }
-      }
-    ]
-  }
-  chart.setOption(option)
-  deviceChartInstance = chart
-  addChartToResizeManager(chart)
-}
+          color: '#fff',
+        },
+      },
+    ],
+  };
+  chart.setOption(option);
+  deviceChartInstance = chart;
+  addChartToResizeManager(chart);
+};
 
 // 初始化3D饼图
 const initPie3DChart = () => {
-  if (!pie3dChart.value) return
+  if (!pie3dChart.value) return;
 
   pie3dChartInstance = renderPie3DChart(pie3dChart.value, {
     data: [
@@ -818,99 +1025,105 @@ const initPie3DChart = () => {
     hoverHeightScale: 2,
     selectOffset: 0.1,
     distance: 220,
-    boxHeight: 5
-  })
+    boxHeight: 5,
+  });
   if (pie3dChartInstance) {
-    addChartToResizeManager(pie3dChartInstance)
+    addChartToResizeManager(pie3dChartInstance);
   }
-}
+};
 
 const initLineChart = () => {
-  if (!lineChart.value) return
+  if (!lineChart.value) return;
 
-  const chart = echarts.init(lineChart.value)
-  chart.setOption(lineChartOption)
-  lineChartInstance = chart
-  addChartToResizeManager(chart)
-}
+  const chart = echarts.init(lineChart.value);
+  chart.setOption(lineChartOption);
+  lineChartInstance = chart;
+  addChartToResizeManager(chart);
+};
 
 const initLineChart2 = () => {
-  if (!lineChart2.value) return
-  const chart = echarts.init(lineChart2.value)
-  chart.setOption(lineChart2Option)
-  lineChart2Instance = chart
-  addChartToResizeManager(chart)
-}
+  if (!lineChart2.value) return;
+  const chart = echarts.init(lineChart2.value);
+  chart.setOption(lineChart2Option);
+  lineChart2Instance = chart;
+  addChartToResizeManager(chart);
+};
 
 const initDeviceThroughputChart = () => {
-  if (!deviceThroughputChart.value) return
-  deviceThroughputChartInstance = echarts.init(deviceThroughputChart.value)
-  deviceThroughputChartInstance.setOption(deviceThroughputOption)
-}
+  if (!deviceThroughputChart.value) return;
+  deviceThroughputChartInstance = echarts.init(deviceThroughputChart.value);
+  deviceThroughputChartInstance.setOption(deviceThroughputOption);
+};
 
+const changeToworkOrderPending = () => {
+  router.push('/property/business/workOrderPending');
+};
+const changeToWorkOrder = () => {
+  router.push('/property/business/workOrderProcessed');
+};
 // 组件挂载时初始化
 onMounted(() => {
-  updateTime()
-  timer = setInterval(updateTime, 1000)
-  initBarChart()
-  initPowerChart()
-  initEnvChart()
-  initWaterChart()
-  initDeviceChart()
-  initPie3DChart()
-  initPieChart()
-  initDeviceThroughputChart()
-  initLineChart()
-  initLineChart2()
-})
+  updateTime();
+  timer = setInterval(updateTime, 1000);
+  initBarChart();
+  initPowerChart();
+  initEnvChart();
+  initWaterChart();
+  initDeviceChart();
+  initPie3DChart();
+  initPieChart();
+  initDeviceThroughputChart();
+  initLineChart();
+  initLineChart2();
+});
 
 // 组件卸载时清理
 onBeforeUnmount(() => {
   if (timer) {
-    clearInterval(timer)
+    clearInterval(timer);
   }
 
   // 从管理器中移除图表
   if (barChartInstance) {
-    removeChartFromResizeManager(barChartInstance)
-    barChartInstance.dispose()
+    removeChartFromResizeManager(barChartInstance);
+    barChartInstance.dispose();
   }
   if (powerChartInstance) {
-    removeChartFromResizeManager(powerChartInstance)
-    powerChartInstance.dispose()
+    removeChartFromResizeManager(powerChartInstance);
+    powerChartInstance.dispose();
   }
   if (envChartInstance) {
-    removeChartFromResizeManager(envChartInstance)
-    envChartInstance.dispose()
+    removeChartFromResizeManager(envChartInstance);
+    envChartInstance.dispose();
   }
   if (waterChartInstance) {
-    removeChartFromResizeManager(waterChartInstance)
-    waterChartInstance.dispose()
+    removeChartFromResizeManager(waterChartInstance);
+    waterChartInstance.dispose();
   }
   if (deviceChartInstance) {
-    removeChartFromResizeManager(deviceChartInstance)
-    deviceChartInstance.dispose()
+    removeChartFromResizeManager(deviceChartInstance);
+    deviceChartInstance.dispose();
   }
   if (pie3dChartInstance) {
-    removeChartFromResizeManager(pie3dChartInstance)
-    pie3dChartInstance.dispose()
+    removeChartFromResizeManager(pie3dChartInstance);
+    pie3dChartInstance.dispose();
   }
   if (pieChartInstance) {
-    removeChartFromResizeManager(pieChartInstance)
-    pieChartInstance.dispose()
+    removeChartFromResizeManager(pieChartInstance);
+    pieChartInstance.dispose();
   }
   if (deviceThroughputChartInstance) {
-    deviceThroughputChartInstance.dispose()
+    deviceThroughputChartInstance.dispose();
   }
   if (lineChartInstance) {
-    removeChartFromResizeManager(lineChartInstance)
-    lineChartInstance.dispose()
+    removeChartFromResizeManager(lineChartInstance);
+    lineChartInstance.dispose();
   }
   if (lineChart2Instance) {
-    removeChartFromResizeManager(lineChart2Instance)
-    lineChart2Instance.dispose()
+    removeChartFromResizeManager(lineChart2Instance);
+    lineChart2Instance.dispose();
   }
-})
+});
 </script>
 
 <style scoped>
@@ -920,337 +1133,353 @@ onBeforeUnmount(() => {
   font-weight: normal;
   font-style: normal;
 }
-.mian{
-    height: 100vh;
-    background: url("../../../assets/digitalIntelligence/bg.png");
-    background-size: 100% 100%;
-    background-color: #081b3a;
-    display: flex;
-    flex-direction: column;
+.mian {
+  height: 100vh;
+  background: url('../../../assets/digitalIntelligence/bg.png');
+  background-size: 100% 100%;
+  background-color: #081b3a;
+  display: flex;
+  flex-direction: column;
 }
 .title {
-    height: 5.375rem;
-    align-items: center;
+  height: 5.375rem;
+  align-items: center;
+  display: flex;
+  justify-content: space-between;
+  .left {
     display: flex;
-    justify-content: space-between;
-    .left{
-        display: flex;
-        width: 14.3125rem;
-        .left-first{
-            padding-left: 2.3125rem;
-            padding-right: 3.5rem;
-            font-size: 1.875rem;
-            color: #FFFFFF;
-        }
-        .left-second{
-            width: 6.5rem;
-            font-family: ShiShangZhongHeiJianTi;
-            font-weight: 400;
-            font-size: 1.25rem;
-            color: #FFFFFF;
-        }
+    width: 18.3125rem;
+    .left-first {
+      padding-left: 2.3125rem;
+      font-size: 1.875rem;
+      width: 10.5rem;
+      color: #ffffff;
     }
-    .center{
+    .left-second {
+      width: 6.5rem;
+      font-family: ShiShangZhongHeiJianTi;
+      font-weight: 400;
+      font-size: 1.25rem;
+      color: #ffffff;
+    }
+  }
+  .center {
     font-size: 1.9rem;
     color: #fff;
     text-align: center;
     font-weight: bold;
     letter-spacing: 0.1em;
-    text-shadow: 0 0 10px #1e90ff, 0 0 20px #1e90ff;
-    }
-    .right{
-        width: 17.3125rem;
-        display: flex;
-        font-family: ShiShangZhongHeiJianTi;
-        font-weight: 400;
-        font-size: 1.25rem;
-        color: #FFFFFF;
-        gap: .75rem;
-        .logout{
-          display: flex;
-          cursor: pointer;
-          align-items: center;
-          gap: .2rem;
-        }
+    text-shadow:
+      0 0 10px #1e90ff,
+      0 0 20px #1e90ff;
+  }
+  .right {
+    width: 17.3125rem;
+    display: flex;
+    font-family: ShiShangZhongHeiJianTi;
+    font-weight: 400;
+    font-size: 1.25rem;
+    color: #ffffff;
+    gap: 0.75rem;
+    .logout {
+      display: flex;
+      cursor: pointer;
+      align-items: center;
+      gap: 0.2rem;
     }
+  }
 }
-.contents{
-    flex: 1;
-    .content{
+.contents {
+  flex: 1;
+  .content {
     height: 100%;
     display: flex;
     justify-content: space-between;
     margin: 1rem 2rem 1.75rem 2rem;
-    .content-left{
-        width: 32.6875rem;
+    .content-left {
+      width: 32.6875rem;
+      display: flex;
+      flex-direction: column;
+      justify-content: space-between;
+      .first {
+        height: 17rem;
         display: flex;
         flex-direction: column;
         justify-content: space-between;
-        .first{
-            height: 17rem;
+        .first-content1 {
+          margin: 0 1.8rem;
+          height: 7.5rem;
+          display: flex;
+          justify-content: space-between;
+          align-items: center;
+        }
+        .first-content1 div {
+          width: 3rem;
+          color: #fff;
+          font-size: 1rem;
+          font-weight: bold;
+          text-align: left;
+        }
+        .first-content2 {
+          flex: 1;
+          .pie-chart {
+            width: 100%;
+            height: 100%;
+          }
+        }
+      }
+      .second {
+        height: 12rem;
+        .second-content {
+          height: 100%;
+          .power-chart {
+            height: 100%;
+          }
+        }
+      }
+      .third {
+        height: 18rem;
+        .third-content {
+          margin-top: 2rem;
+          display: flex;
+          flex-direction: column;
+          height: 16rem;
+          .content1 {
+            height: 5.5rem;
             display: flex;
-            flex-direction: column;
-            justify-content: space-between;
-            .first-content1{
-              margin: 0 1.8rem;
-              height: 7.5rem;
-              display: flex;
-              justify-content: space-between;
-              align-items: center;
-            }
-            .first-content1 div{
-              width: 3rem;
-              color: #fff;
-              font-size: 1rem;
-              font-weight: bold;
-              text-align: left;
-            }
-            .first-content2{
-               flex: 1;
-               .pie-chart {
-                 width: 100%;
-                 height: 100%;
-               }
-             }
-        }
-        .second{
-            height: 12rem;
-            .second-content{
-                height: 100%;
-                .power-chart {
-                    height: 100%;
-                }
-            }
-
-        }
-        .third{
-            height: 18rem;
-            .third-content{
-              margin-top: 2rem;
-              display: flex;
-              flex-direction: column;
-              height: 16rem;
-              .content1{
-                height: 5.5rem;
-                display: flex;
-                justify-content: space-around;
-                align-items: center;
-              }
-              .content1 div{
-                width: 7rem;
-                height: 4rem;
-                display: flex;
-                align-items: center;
-                justify-content: center;
-                font-size: 1.5rem;
-                color: #fff;
-                font-weight: bold;
-              }
-              .content2{
-                flex: 1;
-                .device-throughput-chart{
-                  height: 100%;
-                }
-              }
+            justify-content: space-around;
+            align-items: center;
+          }
+          .content1 div {
+            width: 7rem;
+            height: 4rem;
+            display: flex;
+            align-items: center;
+            justify-content: center;
+            font-size: 1.5rem;
+            color: #fff;
+            font-weight: bold;
+          }
+          .content2 {
+            flex: 1;
+            .device-throughput-chart {
+              height: 100%;
             }
+          }
         }
+      }
     }
-    .content-center{
-        width: 46.5rem;
+    .content-center {
+      width: 46.5rem;
+      display: flex;
+      flex-direction: column;
+      .first {
+        width: 100%;
+        height: 10rem;
+        display: flex;
+        justify-content: space-around;
+        align-items: center;
+        font-size: 1.5rem;
+        color: #fff;
+        font-weight: bold;
+      }
+      .second {
+        margin-top: 1.5rem;
+        height: 30.68rem;
+        background: url('../../../assets/digitalIntelligence/center-bg.png');
+        background-size: 100% 100%;
+        background-repeat: no-repeat;
+        background-position: center;
+      }
+    }
+    .content-right {
+      width: 33rem;
+      display: flex;
+      flex-direction: column;
+      justify-content: space-between;
+      .first {
+        height: 20.5rem;
         display: flex;
         flex-direction: column;
-        .first{
-          width: 100%;
-          height: 10rem;
+        .radio{
+          height: 2.5rem;
+          margin-top: 1.5rem;
+          margin-right: .5rem;
+          display: flex;
+          justify-content: flex-end;
+      }
+      .content-box{
+        height: 17.5rem;
+        display: flex;
+        flex-direction: column;
+        justify-content: space-between;
+        .first-content1 {
+          /* flex: 1; */
+          height: 6.5rem;
+          display: flex;
+          justify-content: center;
+          align-items: end;
+          .line-chart {
+            width: 90%;
+            height: 100%;
+          }
+        }
+        .first-content2 {
+          flex: 1;
+          display: flex;
+          justify-content: center;
+          align-items: end;
+          .line-chart {
+            width: 90%;
+            height: 75%;
+          }
+        }
+      }
+      }
+      .second {
+        height: 7rem;
+        padding-top: 2rem;
+        .second-box {
+          height: 100%;
           display: flex;
           justify-content: space-around;
-          align-items: center;
-          font-size: 1.5rem;
-          color: #fff;
-          font-weight: bold;
-        }
-        .second{
-          margin-top: 1.5rem;
-          height: 30.68rem;
-          background: url("../../../assets/digitalIntelligence/center-bg.png");
-          background-size: 100% 100%;
-          background-repeat: no-repeat;
-          background-position: center;
-
-        }
-    }
-    .content-right{
-        width: 33rem;
-        display: flex;
-        flex-direction: column;
-        justify-content: space-between;
-        .first{
-            height: 20.5rem;
+          .content1 {
+            cursor: pointer;
+            background: url('../../../assets/digitalIntelligence/circle1.png');
+            background-size: 100% 100%;
+            background-repeat: no-repeat;
+            background-position: center;
+            width: 6rem;
+            height: 6rem;
             display: flex;
+            justify-content: center;
             flex-direction: column;
-            .first-content1{
-              flex: 1;
-              display: flex;
-              justify-content: center;
-              align-items: end;
-              .line-chart {
-                width: 90%;
-                height: 75%;
-              }
-            }
-            .first-content2{
-              flex: 1;
-              display: flex;
-              justify-content: center;
-              align-items: end;
-              .line-chart {
-                width: 90%;
-                height: 75%;
-              }
-            }
+            align-items: center;
+            font-size: 1.5rem;
+            color: #fff;
+            font-weight: bold;
+          }
+          .content2 {
+            cursor: pointer;
+            flex-direction: column;
+            background: url('../../../assets/digitalIntelligence/circle2.png');
+            background-size: 100% 100%;
+            background-repeat: no-repeat;
+            background-position: center;
+            width: 6rem;
+            height: 6rem;
+            display: flex;
+            justify-content: center;
+            align-items: center;
+            font-size: 1.5rem;
+            color: #fff;
+            font-weight: bold;
+          }
+          .content3 {
+            flex-direction: column;
+            background: url('../../../assets/digitalIntelligence/circle3.png');
+            background-size: 100% 100%;
+            background-repeat: no-repeat;
+            background-position: center;
+            width: 6rem;
+            height: 6rem;
+            display: flex;
+            justify-content: center;
+            align-items: center;
+            font-size: 1.5rem;
+            color: #fff;
+            font-weight: bold;
+          }
+          .content4 {
+            flex-direction: column;
+            background: url('../../../assets/digitalIntelligence/circle4.png');
+            background-size: 100% 100%;
+            background-repeat: no-repeat;
+            background-position: center;
+            width: 6rem;
+            height: 6rem;
+            display: flex;
+            justify-content: center;
+            align-items: center;
+            font-size: 1.5rem;
+            color: #fff;
+            font-weight: bold;
+          }
+          .content-title {
+            font-size: 0.8rem;
+          }
         }
-        .second{
-            height: 7rem;
-            padding-top: 2rem;
-            .second-box{
-                 height: 100%;
-                  display: flex;
-                  justify-content: space-around;
-                  .content1{
-                    background: url("../../../assets/digitalIntelligence/circle1.png");
-                    background-size: 100% 100%;
-                    background-repeat: no-repeat;
-                    background-position: center;
-                    width: 6rem;
-                    height: 6rem;
-                    display: flex;
-                    justify-content: center;
-                    flex-direction: column;
-                    align-items: center;
-                    font-size: 1.5rem;
-                    color: #fff;
-                    font-weight: bold;
-                  }
-                  .content2{
-                    flex-direction: column;
-                    background: url("../../../assets/digitalIntelligence/circle2.png");
-                    background-size: 100% 100%;
-                    background-repeat: no-repeat;
-                    background-position: center;
-                    width: 6rem;
-                    height: 6rem;
-                    display: flex;
-                    justify-content: center;
-                    align-items: center;
-                    font-size: 1.5rem;
-                    color: #fff;
-                    font-weight: bold;
-                  }
-                  .content3{
-                    flex-direction: column;
-                    background: url("../../../assets/digitalIntelligence/circle3.png");
-                    background-size: 100% 100%;
-                    background-repeat: no-repeat;
-                    background-position: center;
-                    width: 6rem;
-                    height: 6rem;
-                    display: flex;
-                    justify-content: center;
-                    align-items: center;
-                    font-size: 1.5rem;
-                    color: #fff;
-                    font-weight: bold;
-                  }
-                  .content4{
-                    flex-direction: column;
-                    background: url("../../../assets/digitalIntelligence/circle4.png");
-                    background-size: 100% 100%;
-                    background-repeat: no-repeat;
-                    background-position: center;
-                    width: 6rem;
-                    height: 6rem;
-                    display: flex;
-                    justify-content: center;
-                    align-items: center;
-                    font-size: 1.5rem;
-                    color: #fff;
-                    font-weight: bold;
-                  }
-                  .content-title{
-                    font-size: .8rem;
-                  }
-            }
-        }
-        .third{
-            height: 18rem;
-            .device-cards {
-                      display: flex;
-                      justify-content: space-between;
-                      margin-top: 2rem;
-                      margin-right: 1.06rem;
-                      /* margin-bottom: 0.5rem; */
-                      margin-left: 1.31rem;
-                        .device-card1{
-                          height: 3.2rem;
-                          width: 7.21rem;
-                          background: url("../../../assets/energyConsumptionAnalysis/devices-number.png");
-                          background-size: 100% 100%;
-                          display: flex;
-                          align-items: center;
-                          justify-content: center;
+      }
+      .third {
+        height: 18rem;
+        .device-cards {
+          display: flex;
+          justify-content: space-between;
+          margin-top: 2rem;
+          margin-right: 1.06rem;
+          /* margin-bottom: 0.5rem; */
+          margin-left: 1.31rem;
+          .device-card1 {
+            height: 3.2rem;
+            width: 7.21rem;
+            background: url('../../../assets/energyConsumptionAnalysis/devices-number.png');
+            background-size: 100% 100%;
+            display: flex;
+            align-items: center;
+            justify-content: center;
 
-                        .device-card1-value{
-                          font-family: Arial;
-                          font-weight: bold;
-                          font-size: 1.25rem;
-                          color: #02B3F4;
-                        }
-                      }
-                        .device-card2{
-                          height: 3.2rem;
-                          width: 7.21rem;
-                          background: url("../../../assets/energyConsumptionAnalysis/devices-online.png");
-                          background-size: 100% 100%;
-                          display: flex;
-                          align-items: center;
-                          justify-content: center;
-                          .device-card2-value{
-                          font-family: Arial;
-                          font-weight: bold;
-                          font-size: 1.25rem;
-                          color: #1DE39D;
-                        }
-                        }
-                        .device-card3{
-                          height: 3.2rem;
-                          width: 7.21rem;
-                          background: url("../../../assets/energyConsumptionAnalysis/devices-offline.png");
-                          background-size: 100% 100%;
-                          display: flex;
-                          align-items: center;
-                          justify-content: center;
-                          .device-card3-value{
-                          font-family: Arial;
-                          font-weight: bold;
-                          font-size: 1.25rem;
-                          color: #F19315;
-                        }
-                        }
-                        .device-card-text{
-                          font-family: Microsoft YaHei UI;
-                            font-weight: 400;
-                            font-size: 0.75rem;
-                            color: #A1B2C2;
-                            line-height: 0.75rem;
-                        }
-                    }
-            .device-chart {
-              height: 10rem;
-              /* margin-top: 0.2rem; */
+            .device-card1-value {
+              font-family: Arial;
+              font-weight: bold;
+              font-size: 1.25rem;
+              color: #02b3f4;
             }
+          }
+          .device-card2 {
+            height: 3.2rem;
+            width: 7.21rem;
+            background: url('../../../assets/energyConsumptionAnalysis/devices-online.png');
+            background-size: 100% 100%;
+            display: flex;
+            align-items: center;
+            justify-content: center;
+            .device-card2-value {
+              font-family: Arial;
+              font-weight: bold;
+              font-size: 1.25rem;
+              color: #1de39d;
+            }
+          }
+          .device-card3 {
+            height: 3.2rem;
+            width: 7.21rem;
+            background: url('../../../assets/energyConsumptionAnalysis/devices-offline.png');
+            background-size: 100% 100%;
+            display: flex;
+            align-items: center;
+            justify-content: center;
+            .device-card3-value {
+              font-family: Arial;
+              font-weight: bold;
+              font-size: 1.25rem;
+              color: #f19315;
+            }
+          }
+          .device-card-text {
+            font-family: Microsoft YaHei UI;
+            font-weight: 400;
+            font-size: 0.75rem;
+            color: #a1b2c2;
+            line-height: 0.75rem;
+          }
         }
+        .device-chart {
+          height: 10rem;
+          /* margin-top: 0.2rem; */
+        }
+      }
     }
-}
+  }
 }
 .pie3d-title {
   color: #fff;
diff --git a/apps/web-antd/src/views/screen/energyConsumptionAnalysis/index.vue b/apps/web-antd/src/views/screen/energyConsumptionAnalysis/index.vue
index 139d3aad..430a427d 100644
--- a/apps/web-antd/src/views/screen/energyConsumptionAnalysis/index.vue
+++ b/apps/web-antd/src/views/screen/energyConsumptionAnalysis/index.vue
@@ -549,7 +549,6 @@ onBeforeUnmount(() => {
   if (timer) {
     clearInterval(timer);
   }
-
   // 从管理器中移除图表
   if (barChartInstance) {
     removeChartFromResizeManager(barChartInstance);
@@ -600,11 +599,11 @@ onBeforeUnmount(() => {
   justify-content: space-between;
   .left {
     display: flex;
-    width: 14.3125rem;
+    width: 18.3125rem;
     .left-first {
       padding-left: 2.3125rem;
-      padding-right: 3.5rem;
       font-size: 1.875rem;
+      width: 10.5rem;
       color: #ffffff;
     }
     .left-second {
diff --git a/apps/web-antd/src/views/screen/monitor/index.vue b/apps/web-antd/src/views/screen/monitor/index.vue
index 71614e8d..11be9952 100644
--- a/apps/web-antd/src/views/screen/monitor/index.vue
+++ b/apps/web-antd/src/views/screen/monitor/index.vue
@@ -862,24 +862,23 @@ onBeforeUnmount(() => {
     align-items: center;
     display: flex;
     justify-content: space-between;
-    .left{
-        display: flex;
-        width: 20.3125rem;
-        .left-first{
-            padding-left: 2.3125rem;
-            padding-right: 3.5rem;
-            font-size: 1.875rem;
-            color: #FFFFFF;
-        }
-        .left-second{
-            width: 6.5rem;
-            font-family: ShiShangZhongHeiJianTi;
-            font-weight: 400;
-            font-size: 1.25rem;
-            color: #FFFFFF;
-            display: flex;
-        }
+    .left {
+    display: flex;
+    width: 18.3125rem;
+    .left-first {
+      padding-left: 2.3125rem;
+      font-size: 1.875rem;
+      width: 10.5rem;
+      color: #ffffff;
     }
+    .left-second {
+      width: 6.5rem;
+      font-family: ShiShangZhongHeiJianTi;
+      font-weight: 400;
+      font-size: 1.25rem;
+      color: #ffffff;
+    }
+  }
     .center{
     font-size: 1.9rem;
     color: #fff;
diff --git a/apps/web-antd/src/views/screen/navigation/Navigation.vue b/apps/web-antd/src/views/screen/navigation/Navigation.vue
index 3b47d15e..e2bf5ccd 100644
--- a/apps/web-antd/src/views/screen/navigation/Navigation.vue
+++ b/apps/web-antd/src/views/screen/navigation/Navigation.vue
@@ -35,7 +35,7 @@
       </div>
       <div class="navigation-body-right">
         <div @click="goToMonitor()">监控大屏</div>
-        <div @click="goToDigitalIntelligence()">商务中心</div>
+        <div @click="goToDigitalIntelligence()">综合服务中心</div>
         <div @click="goToHome()">后台管理</div>
         <!-- <div>能源管理</div>
         <div>能耗分析</div> -->
diff --git a/apps/web-antd/src/views/screen/property/index.vue b/apps/web-antd/src/views/screen/property/index.vue
index 304374a4..2ea12f21 100644
--- a/apps/web-antd/src/views/screen/property/index.vue
+++ b/apps/web-antd/src/views/screen/property/index.vue
@@ -70,12 +70,30 @@
             </div>
           </div>
           <div class="content-center-second">
-            <div class="second-item">
-              <div class="second-item-box1">645</div>
-              <div class="second-item-box2">729</div>
-              <div class="second-item-box3">648</div>
-              <div class="second-item-box4">786</div>
-              <div class="second-item-box5">645</div>
+            <div class="second-item" @click="changeToPersonnelDuty">
+              <div>
+                <div class="second-item-box1">
+                645
+              </div>
+              <div class="second-item-box-label">采购部</div>
+              </div>
+<div>
+  <div class="second-item-box2">729
+              </div>
+                <div class="second-item-box-label">研发部</div>
+              </div>
+              <div>
+                <div class="second-item-box3">648</div>
+                <div class="second-item-box-label">安保部</div>
+              </div>
+              <div>
+                <div class="second-item-box4">786</div>
+                <div class="second-item-box-label">人事部</div>
+              </div>
+              <div>
+                <div class="second-item-box5">645</div>
+                <div class="second-item-box-label">财务部</div>
+              </div>
             </div>
           </div>
         </div>
@@ -87,15 +105,19 @@
           <div class="second">
             <div class="second-box">
               <div class="box-content">
-                <div class="box-content-label">服务数量</div>
+                <div class="box-content-label">维修</div>
                 <div class="box-content-num">132</div>
               </div>
               <div class="box-content">
-                <div class="box-content-label">服务数量</div>
+                <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-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>
@@ -187,31 +209,47 @@ const initBarChart = () => {
     yAxis: {},
     series: [
       {
-        name: '销量',
+        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],
+      },
     ],
   });
 };
 
-// 初始化电力图表
+// 初始化预约情况图表
 const initPowerChart = () => {
   if (!powerChart.value) return;
-
   const chart = echarts.init(powerChart.value);
   const option = {
     tooltip: { trigger: 'axis' },
-    grid: { left: 40, right: 20, top: 32, bottom: 20 },
+    grid: { left: 40, right: 50, top: 62, bottom: 20 },
     xAxis: {
       type: 'category',
       data: Array.from({ length: 19 }, (_, i) => i + 6),
       axisLine: { lineStyle: { color: '#3ec6ff' } },
       axisLabel: { color: '#fff' },
+      name: '小时',
+      nameTextStyle: { color: '#fff' },
+      nameLocation: 'end',
+      nameGap: 5,
     },
     yAxis: {
       type: 'value',
-      name: '',
+      name: '次',
+      nameTextStyle: { color: '#fff' },
+      nameLocation: 'end',
+      nameGap: 10,
       axisLine: { lineStyle: { color: '#3ec6ff' } },
       axisLabel: { color: '#fff' },
       splitLine: { lineStyle: { color: '#1e90ff22' } },
@@ -462,6 +500,10 @@ const initPie3DChart = () => {
   }
 };
 
+const changeToPersonnelDuty=()=>{
+  router.push('/property/attendanceManagement/workforceManagement')
+}
+
 // 组件挂载时初始化
 onMounted(() => {
   updateTime();
@@ -530,11 +572,11 @@ onBeforeUnmount(() => {
   justify-content: space-between;
   .left {
     display: flex;
-    width: 14.3125rem;
+    width: 18.3125rem;
     .left-first {
       padding-left: 2.3125rem;
-      padding-right: 3.5rem;
       font-size: 1.875rem;
+      width: 10.5rem;
       color: #ffffff;
     }
     .left-second {
@@ -709,6 +751,7 @@ onBeforeUnmount(() => {
           display: flex;
           justify-content: space-around;
           align-items: center;
+          cursor: pointer;
           .second-item-box1 {
             width: 7rem;
             height: 7rem;
@@ -722,6 +765,14 @@ onBeforeUnmount(() => {
             background: url('../../../assets/property/personnel-duty-circle1.png');
             background-size: 100% 100%;
           }
+          .second-item-box-label{
+            display: flex;
+            justify-content: center;
+            align-items: center;
+            font-weight: 400;
+            font-size: 1rem;
+            color: #ffffff;
+          }
           .second-item-box2 {
             width: 7rem;
             height: 7rem;
diff --git a/apps/web-antd/src/views/screen/security/index.vue b/apps/web-antd/src/views/screen/security/index.vue
index 2e44f114..94cb47ec 100644
--- a/apps/web-antd/src/views/screen/security/index.vue
+++ b/apps/web-antd/src/views/screen/security/index.vue
@@ -750,23 +750,23 @@ onBeforeUnmount(() => {
     align-items: center;
     display: flex;
     justify-content: space-between;
-    .left{
-        display: flex;
-        width: 14.3125rem;
-        .left-first{
-            padding-left: 2.3125rem;
-            padding-right: 3.5rem;
-            font-size: 1.875rem;
-            color: #FFFFFF;
-        }
-        .left-second{
-            width: 6.5rem;
-            font-family: ShiShangZhongHeiJianTi;
-            font-weight: 400;
-            font-size: 1.25rem;
-            color: #FFFFFF;
-        }
+    .left {
+    display: flex;
+    width: 18.3125rem;
+    .left-first {
+      padding-left: 2.3125rem;
+      font-size: 1.875rem;
+      width: 10.5rem;
+      color: #ffffff;
     }
+    .left-second {
+      width: 6.5rem;
+      font-family: ShiShangZhongHeiJianTi;
+      font-weight: 400;
+      font-size: 1.25rem;
+      color: #ffffff;
+    }
+  }
     .center{
     font-size: 1.9rem;
     color: #fff;
diff --git a/apps/web-antd/src/views/videoSystem/videoWarning/algorithmManagement/index.vue b/apps/web-antd/src/views/videoSystem/videoWarning/algorithmManagement/index.vue
index ec595534..91f06294 100644
--- a/apps/web-antd/src/views/videoSystem/videoWarning/algorithmManagement/index.vue
+++ b/apps/web-antd/src/views/videoSystem/videoWarning/algorithmManagement/index.vue
@@ -98,7 +98,7 @@
           <SelectOption value="50">50条/页</SelectOption>
         </Select>
       </div>
-    </div>
+  </div>
 
     <!-- 算法详情弹窗 -->
     <AlgorithmDetailModal />
diff --git a/packages/effects/layouts/src/authentication/authentication.vue b/packages/effects/layouts/src/authentication/authentication.vue
index 551d3d8c..0b714e01 100644
--- a/packages/effects/layouts/src/authentication/authentication.vue
+++ b/packages/effects/layouts/src/authentication/authentication.vue
@@ -149,6 +149,7 @@ const handleAccountLogin = async () => {
           </div>
         </div>
       </div>
+      <div class="login-footer">重庆数字南川大数据产业发展有限公司</div>
     </div>
   </div>
   <!-- <div
@@ -431,4 +432,11 @@ input:-webkit-autofill {
 .login-form input::placeholder {
   color: rgba(255, 255, 255, 0.42); /* 例如灰色 */
 }
+.login-footer{
+  position: fixed;
+  bottom: 0;
+  left: 0;
+  right: 0;
+  z-index: 100;
+}
 </style>