From 3e9e46dddec408c82f103599262cd5707d91627e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9B=B9=E7=A3=8A?= <45566618@qq.com>
Date: Mon, 14 Jul 2025 10:46:29 +0800
Subject: [PATCH] =?UTF-8?q?=E8=AE=A2=E5=8D=95=E6=8A=A5=E8=A1=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/chart/Bar.vue                  |   2 +-
 .../zh/housingestateInfo/xqHyxzIndex.vue      |   2 +-
 .../zh/housingestateInfo/xqTdcsIndex.vue      |   2 +-
 .../zh/housingestateInfo/xqTdzlIndex.vue      |   2 +-
 src/views/zh/hy/hy.data.ts                    |   6 -
 src/views/zh/hy/tdcs/index.vue                |   2 +-
 src/views/zh/hy/tdzl/index.vue                |   2 +-
 src/views/zh/hy/wg/index.vue                  |   2 +-
 src/views/zh/hy/xz/index.vue                  |   2 +-
 src/views/zh/hy/zc/index.vue                  |   2 +-
 src/views/zh/order/order.api.ts               |  41 ++++
 src/views/zh/order/order.data.ts              | 132 +++++++++++++
 src/views/zh/order/sjdtdcs/index.vue          | 182 ++++++++++++++++++
 src/views/zh/order/sjdtdje/index.vue          | 182 ++++++++++++++++++
 src/views/zh/order/wgddjetj/index.vue         | 160 +++++++++++++++
 src/views/zh/qy/qy.data.ts                    |   6 -
 src/views/zh/qy/sjdcs/index.vue               |   2 +-
 src/views/zh/qy/sjdzl/index.vue               |   2 +-
 src/views/zh/qy/sjqycs/index.vue              |   2 +-
 src/views/zh/qy/sjqyzl/index.vue              |   2 +-
 src/views/zh/qy/xqqycs/index.vue              |   2 +-
 src/views/zh/shebei/shebei.data.ts            |   5 -
 src/views/zh/shebei/tdcs/index.vue            |   2 +-
 src/views/zh/shebei/tdcstj/index.vue          |   2 +-
 src/views/zh/shebei/tdjetj/index.vue          |   2 +-
 src/views/zh/shebei/tdzl/index.vue            |   2 +-
 26 files changed, 715 insertions(+), 35 deletions(-)
 create mode 100644 src/views/zh/order/order.api.ts
 create mode 100644 src/views/zh/order/order.data.ts
 create mode 100644 src/views/zh/order/sjdtdcs/index.vue
 create mode 100644 src/views/zh/order/sjdtdje/index.vue
 create mode 100644 src/views/zh/order/wgddjetj/index.vue

diff --git a/src/components/chart/Bar.vue b/src/components/chart/Bar.vue
index b0e5b8c..b33958c 100644
--- a/src/components/chart/Bar.vue
+++ b/src/components/chart/Bar.vue
@@ -46,7 +46,7 @@
         default: () => ({
           left: '3%',
           right: '4%',
-          bottom: '3%',
+          bottom: '8%',
           containLabel: true
         }),
       },
diff --git a/src/views/zh/housingestateInfo/xqHyxzIndex.vue b/src/views/zh/housingestateInfo/xqHyxzIndex.vue
index f9eb2f8..63a9b1a 100644
--- a/src/views/zh/housingestateInfo/xqHyxzIndex.vue
+++ b/src/views/zh/housingestateInfo/xqHyxzIndex.vue
@@ -29,7 +29,7 @@
           </a-radio-group>
         </a-col>
       </a-row>
-      <Bar v-show="!izList" :chartData="dataSource" height="80vh" :option="{ title: { text: '小区新增会员统计', left: 'center' }}" :itemStyle="{ normal: {label : {show: true, position: 'top'}}}" :seriesName="'新增会员'"></Bar>
+      <Bar v-show="!izList" :chartData="dataSource" height="75vh" :option="{ title: { text: '小区新增会员统计', left: 'center' }}" :itemStyle="{ normal: {label : {show: true, position: 'top'}}}" :seriesName="'新增会员'"></Bar>
       <div  v-show="izList" style="margin-top: 20px;">
         <a-table :dataSource="dataSource" :columns="xzrsColumns">
           <template #bodyCell="{ column, record }">
diff --git a/src/views/zh/housingestateInfo/xqTdcsIndex.vue b/src/views/zh/housingestateInfo/xqTdcsIndex.vue
index b6291d0..72d4ae0 100644
--- a/src/views/zh/housingestateInfo/xqTdcsIndex.vue
+++ b/src/views/zh/housingestateInfo/xqTdcsIndex.vue
@@ -29,7 +29,7 @@
           </a-radio-group>
         </a-col>
       </a-row>
-      <Bar v-show="!izList" :chartData="dataSource" height="80vh" :option="{ title: { text: '小区投递次数排行榜', left: 'center' }}" :itemStyle="{ normal: {label : {show: true, position: 'top'}}}" :seriesName="'投递次数'"></Bar>
+      <Bar v-show="!izList" :chartData="dataSource" height="75vh" :option="{ title: { text: '小区投递次数排行榜', left: 'center' }}" :itemStyle="{ normal: {label : {show: true, position: 'top'}}}" :seriesName="'投递次数'"></Bar>
       <div  v-show="izList" style="margin-top: 20px;">
         <a-table :dataSource="dataSource" :columns="tdcsColumns" >
           <template #bodyCell="{ column, record }">
diff --git a/src/views/zh/housingestateInfo/xqTdzlIndex.vue b/src/views/zh/housingestateInfo/xqTdzlIndex.vue
index ee27a33..27ac7c6 100644
--- a/src/views/zh/housingestateInfo/xqTdzlIndex.vue
+++ b/src/views/zh/housingestateInfo/xqTdzlIndex.vue
@@ -29,7 +29,7 @@
           </a-radio-group>
         </a-col>
       </a-row>
-      <Bar v-show="!izList" :chartData="dataSource" height="80vh" :option="{ title: { text: '小区投递重量排行榜', left: 'center' }}" :itemStyle="{ normal: {label : {show: true, position: 'top'}}}" :seriesName="'投递重量'"></Bar>
+      <Bar v-show="!izList" :chartData="dataSource" height="75vh" :option="{ title: { text: '小区投递重量排行榜', left: 'center' }}" :itemStyle="{ normal: {label : {show: true, position: 'top'}}}" :seriesName="'投递重量'"></Bar>
       <div  v-show="izList" style="margin-top: 20px;">
         <a-table :dataSource="dataSource" :columns="tdzlColumns" >
           <template #bodyCell="{ column, record }">
diff --git a/src/views/zh/hy/hy.data.ts b/src/views/zh/hy/hy.data.ts
index 34c4369..50996ad 100644
--- a/src/views/zh/hy/hy.data.ts
+++ b/src/views/zh/hy/hy.data.ts
@@ -1,11 +1,5 @@
 import {BasicColumn} from '/@/components/Table';
-import {FormSchema} from '/@/components/Table';
-import { rules} from '/@/utils/helper/validator';
-import { render } from '/@/utils/common/renderUtils';
-import { getWeekMonthQuarterYear } from '/@/utils';
-import {ref} from "vue";
 //列表数据
-
 export const xzrsColumns : BasicColumn[] =[
   {
     title: '序号',
diff --git a/src/views/zh/hy/tdcs/index.vue b/src/views/zh/hy/tdcs/index.vue
index 1e4e605..1f00e27 100644
--- a/src/views/zh/hy/tdcs/index.vue
+++ b/src/views/zh/hy/tdcs/index.vue
@@ -27,7 +27,7 @@
           </a-radio-group>
         </a-col>
       </a-row>
-      <Bar v-show="!izList" :chartData="dataSource" height="80vh"
+      <Bar v-show="!izList" :chartData="dataSource" height="75vh"
         :option="{ title: { text: '会员投递次数排行榜', left: 'center' } }"
         :itemStyle="{ normal: { label: { show: true, position: 'top' } } }" :seriesName="'投递次数'"></Bar>
       <div  v-show="izList" style="margin-top: 20px;">
diff --git a/src/views/zh/hy/tdzl/index.vue b/src/views/zh/hy/tdzl/index.vue
index dc9848e..766618b 100644
--- a/src/views/zh/hy/tdzl/index.vue
+++ b/src/views/zh/hy/tdzl/index.vue
@@ -29,7 +29,7 @@
           </a-radio-group>
         </a-col>
       </a-row>
-      <Bar v-show="!izList" :chartData="dataSource" height="80vh" :option="{ title: { text: '会员投递重量排行榜', left: 'center' }}" :itemStyle="{ normal: {label : {show: true, position: 'top'}}}" :seriesName="'投递重量'"></Bar>
+      <Bar v-show="!izList" :chartData="dataSource" height="75vh" :option="{ title: { text: '会员投递重量排行榜', left: 'center' }}" :itemStyle="{ normal: {label : {show: true, position: 'top'}}}" :seriesName="'投递重量'"></Bar>
       <div v-show="izList" style="margin-top: 20px;">
         <a-table :dataSource="dataSource" :columns="tdzlColumns">
           <template #bodyCell="{ column, record }">
diff --git a/src/views/zh/hy/wg/index.vue b/src/views/zh/hy/wg/index.vue
index c79a195..f986f35 100644
--- a/src/views/zh/hy/wg/index.vue
+++ b/src/views/zh/hy/wg/index.vue
@@ -26,7 +26,7 @@
           </a-radio-group>
         </a-col>
       </a-row>
-      <Bar v-show="!izList" :chartData="dataSource" height="80vh"
+      <Bar v-show="!izList" :chartData="dataSource" height="75vh"
         :option="{ title: { text: '会员违规信息统计', left: 'center' } }"
         :itemStyle="{ normal: { label: { show: true, position: 'top' } } }" :seriesName="'违规会员数'"></Bar>
       <div v-show="izList" style="margin-top: 20px;">
diff --git a/src/views/zh/hy/xz/index.vue b/src/views/zh/hy/xz/index.vue
index bc9cf0d..951d1d6 100644
--- a/src/views/zh/hy/xz/index.vue
+++ b/src/views/zh/hy/xz/index.vue
@@ -20,7 +20,7 @@
           </a-radio-group>
         </a-col>
       </a-row>
-      <BaseAreaLine v-show="!izList" :chartData="dataSource" height="80vh" :option="{ title: { text: '新增会员统计', left: 'center' }}" :seriesLabel="{show: true, position: 'top'}" :seriesName="'新增会员'"></BaseAreaLine>
+      <BaseAreaLine v-show="!izList" :chartData="dataSource" height="75vh" :option="{ title: { text: '新增会员统计', left: 'center' }}" :seriesLabel="{show: true, position: 'top'}" :seriesName="'新增会员'"></BaseAreaLine>
       <div  v-show="izList" style="margin-top: 20px;">
         <a-table :dataSource="dataSource" :columns="xzrsColumns">
           <template #bodyCell="{ column, record }">
diff --git a/src/views/zh/hy/zc/index.vue b/src/views/zh/hy/zc/index.vue
index 55b5837..0975f96 100644
--- a/src/views/zh/hy/zc/index.vue
+++ b/src/views/zh/hy/zc/index.vue
@@ -14,7 +14,7 @@
           </a-select>
         </a-col>
       </a-row>
-      <Bar :chartData="dataSource" height="80vh" :option="{ title: { text: '会员注册时间段统计', left: 'center' }}" :itemStyle="{ normal: {label : {show: true, position: 'top'}}}" :seriesName="'个数'"></Bar>
+      <Bar :chartData="dataSource" height="75vh" :option="{ title: { text: '会员注册时间段统计', left: 'center' }}" :itemStyle="{ normal: {label : {show: true, position: 'top'}}}" :seriesName="'个数'"></Bar>
     </a-card>
   </div>
 </template>
diff --git a/src/views/zh/order/order.api.ts b/src/views/zh/order/order.api.ts
new file mode 100644
index 0000000..9fb0c17
--- /dev/null
+++ b/src/views/zh/order/order.api.ts
@@ -0,0 +1,41 @@
+import { defHttp } from '/@/utils/http/axios';
+
+enum Api {
+  housingestateList = '/zh/hy/queryHousingestateList',
+  queryOrderList = '/zh/order/queryOrderList',
+  queryWgOrderList = '/zh/order/queryWgOrderList',
+  querySjdtdcsList = '/zh/order/querySjdtdcsList',
+  querySjdtdjeList = '/zh/order/querySjdtdjeList',
+  queryWgddjetjList = '/zh/order/queryWgddjetjList',
+}
+
+/**
+ * 获取小区
+ * @param params
+ */
+export const housingestateList = (params) => defHttp.get({ url: Api.housingestateList, params });
+/**
+ * 订单列表
+ * @param params
+ */
+export const orderList = (params) => defHttp.get({ url: Api.queryOrderList, params });
+/**
+ * 违规订单列表
+ * @param params
+ */
+export const wgOrderList = (params) => defHttp.get({ url: Api.queryWgOrderList, params });
+/**
+ * 时间段投递次数
+ * @param params
+ */
+export const sjdtdcsList = (params) => defHttp.get({ url: Api.querySjdtdcsList, params });
+/**
+ * 时间段投递金额
+ * @param params
+ */
+export const sjdtdjeList = (params) => defHttp.get({ url: Api.querySjdtdjeList, params });
+/**
+ * 违规订单金额统计
+ * @param params
+ */
+export const wgddjetjList = (params) => defHttp.get({ url: Api.queryWgddjetjList, params });
diff --git a/src/views/zh/order/order.data.ts b/src/views/zh/order/order.data.ts
new file mode 100644
index 0000000..76e0c18
--- /dev/null
+++ b/src/views/zh/order/order.data.ts
@@ -0,0 +1,132 @@
+import {BasicColumn} from '/@/components/Table';
+
+export const detailColumns : BasicColumn[] =[
+  {
+    title: '序号',
+    dataIndex: 'rowNumber',
+    key: 'rowNumber',
+    align: 'center'
+  },
+  {
+    title: '小区名称',
+    dataIndex: 'housingestateName',
+    key: 'housingestateName',
+    align: 'center'
+  },
+  {
+    title: '设备地点',
+    dataIndex: 'content',
+    key: 'content',
+    align: 'center'
+  },
+  {
+    title: '会员手机号',
+    dataIndex: 'phone',
+    key: 'phone',
+    align: 'center'
+  },
+  {
+    title: '投递时间',
+    dataIndex: 'addTime',
+    key: 'addTime',
+    align: 'center'
+  },
+  {
+    title: '重量',
+    dataIndex: 'weight',
+    key: 'weight',
+    align: 'center'
+  },
+  {
+    title: '实际金额',
+    dataIndex: 'money',
+    key: 'money',
+    align: 'center',
+    customRender: function ({ text, record, index}) {
+      return (record.money - record.deductMoney).toFixed(2)
+    }
+  },
+  {
+    title: '订单金额',
+    dataIndex: 'money',
+    key: 'money',
+    align: 'center',
+  },
+  {
+    title: '扣除金额',
+    dataIndex: 'deductMoney',
+    key: 'deductMoney',
+    align: 'center'
+  },
+  {
+    title: '订单状态',
+    dataIndex: 'invalid',
+    key: 'invalid',
+    align: 'center',
+    customRender: function ({ text }) {
+      if (text == '0') {
+        return '正常';
+      } else if (text == '1') {
+        return '违规';
+      } else if (text == '2') {
+        return '部分违规';
+      } else if (text == '3') {
+        return '待审核';
+      } else if (text == '4') {
+        return '异常';
+      } else if (text == '5') {
+        return '忽略';
+      }else{
+        return '';
+      }
+    },
+  },
+  {
+    title: '原因',
+    dataIndex: 'cause',
+    key: 'cause',
+    align: 'center'
+  },
+]
+
+export const sjdtdcsColumns : BasicColumn[] =[
+  {
+    title: '时间',
+    dataIndex: 'name',
+    key: 'name',
+    align: 'center'
+  },
+  {
+    title: '投递次数',
+    dataIndex: 'value',
+    key: 'value',
+    align: 'center'
+  },
+  {
+    title: '操作',
+    key: 'action',
+    align: 'center',
+    width: '150px',
+  }
+]
+
+export const sjdtdjeColumns : BasicColumn[] =[
+  {
+    title: '时间',
+    dataIndex: 'name',
+    key: 'name',
+    align: 'center'
+  },
+  {
+    title: '金额',
+    dataIndex: 'value',
+    key: 'value',
+    align: 'center'
+  },
+  {
+    title: '操作',
+    key: 'action',
+    align: 'center',
+    width: '150px',
+  }
+]
diff --git a/src/views/zh/order/sjdtdcs/index.vue b/src/views/zh/order/sjdtdcs/index.vue
new file mode 100644
index 0000000..ccd433d
--- /dev/null
+++ b/src/views/zh/order/sjdtdcs/index.vue
@@ -0,0 +1,182 @@
+<template>
+  <div class="p-4">
+    <a-card :bordered="false" style="height: 100%">
+      <a-row>
+        <a-col :span="21">
+          <a-radio-group v-model:value="parmas.type" @change="changeType">
+            <a-radio-button value="1">当天</a-radio-button>
+            <a-radio-button value="2">近3天</a-radio-button>
+            <a-radio-button value="3">近7天</a-radio-button>
+            <a-radio-button value="4">近30天</a-radio-button>
+            <a-radio-button value="5">自定义</a-radio-button>
+          </a-radio-group>
+          <span v-show="parmas.type == '5'" style="margin-left: 5px;">
+            <a-range-picker :value-format="valueFormat" @change="changeDate" />
+          </span>
+          <a-select ref="select" placeholder="请选区域" v-model:value="parmas.housingestateId"
+                    style="width: 200px;margin-left: 5px;" @change="handleHousinges">
+            <a-select-option value="">全部</a-select-option>
+            <a-select-option :value="item.housingestateId" v-for="item in housingestates" :key="item.housingestateId">{{item.housingestateName }}</a-select-option>
+          </a-select>
+        </a-col>
+        <a-col :span="3">
+          <a-radio-group v-model:value="izList" button-style="solid" @change="loadDate">
+            <a-radio-button :value="false">统计图</a-radio-button>
+            <a-radio-button :value="true">列表页</a-radio-button>
+          </a-radio-group>
+        </a-col>
+      </a-row>
+      <Bar v-show="!izList" :chartData="dataSource" height="75vh" :option="{ title: { text: '时间段投递订单次数统计', left: 'center' }}" :itemStyle="{ normal: {label : {show: true, position: 'top'}}}" :seriesName="'投递次数'"></Bar>
+      <div  v-show="izList" style="margin-top: 20px;">
+        <a-table :dataSource="dataSource" :columns="sjdtdcsColumns" :pagination="false">
+          <template #bodyCell="{ column, record }">
+            <template v-if="column.key === 'action'">
+              <a-button type="link" @click="handleView(record)">查看</a-button>
+            </template>
+          </template>
+        </a-table>
+      </div>
+    </a-card>
+    <a-modal v-model:visible="detailVisible" title="订单详情" width="80%" :footer="null">
+      <a-spin :spinning="confirmLoading">
+        <a-row>
+          <a-col :span="20">
+            <div style="margin: 5px 0px 5px 20px">订单状态
+              <a-select ref="select"
+                        placeholder="请选订单状态"
+                        v-model:value="detailParmas.invalid"
+                        style="width: 200px;margin-left: 5px;"
+                        @change="loadDetailDate">
+                <a-select-option value="" >全部</a-select-option>
+                <a-select-option value="0">正常</a-select-option>
+                <a-select-option value="1">违规</a-select-option>
+                <a-select-option value="2">部分违规</a-select-option>
+                <a-select-option value="3">待审核</a-select-option>
+                <a-select-option value="4">异常</a-select-option>
+                <a-select-option value="5">忽略</a-select-option>
+              </a-select>
+            </div>
+          </a-col>
+        </a-row>
+        <a-table :dataSource="detailData" :columns="detailColumns" rowKey="rowNumber">
+        </a-table>
+      </a-spin>
+    </a-modal>
+  </div>
+</template>
+
+<script lang="ts" setup>
+import { ref, unref, reactive, onMounted } from 'vue';
+import Bar from '/@/components/chart/Bar.vue';
+import { housingestateList,sjdtdcsList,orderList } from '../order.api';
+import { sjdtdcsColumns,detailColumns } from '../order.data';
+
+const valueFormat = 'YYYY-MM-DD';
+const dataSource = ref([]);
+const dateValue = ref();
+const housingestates = ref();
+const izList = ref(false)
+const detailVisible = ref(false);
+const confirmLoading = ref(false);
+const detailData = ref([]);
+
+async function getHousingestates(){
+  housingestates.value = await housingestateList();
+}
+
+const parmas = reactive<any>({
+  beginTime: '',
+  endTime: '',
+  type: '1',
+  housingestateId: '',
+})
+
+function handleHousinges(){
+  loadDate();
+};
+
+
+const detailParmas = reactive<any>({
+  housingestateId: '',
+  invalid: '',
+  shortHour: '',
+})
+
+function changeType() {
+  parmas.endTime = getPreviousDate(0) + ' 23:59:59';
+  if (parmas.type === '1') {
+    parmas.beginTime = getPreviousDate(0) + ' 00:00:00';
+    loadDate();
+  }
+  if (parmas.type === '2') {
+    parmas.beginTime = getPreviousDate(2) + ' 00:00:00';
+    loadDate();
+  }
+  if (parmas.type === '3') {
+    parmas.beginTime = getPreviousDate(6) + ' 00:00:00';
+    loadDate();
+  }
+  if (parmas.type === '4') {
+    parmas.beginTime = getPreviousDate(29) + ' 00:00:00';
+    loadDate();
+  }
+}
+
+const changeDate = (date, dateString) => {
+  parmas.beginTime = dateString[0] + ' 00:00:00';
+  parmas.endTime = dateString[1] + ' 23:59:59';
+  loadDate();
+};
+
+async function loadDate() {
+  const res = await sjdtdcsList(parmas);
+  dataSource.value = [];
+  for (let i = 0; i < res.length; i++) {
+    dataSource.value.push({
+      shortHour: `${res[i].shortHour}`,
+      name: `${res[i].shortHour}时`,
+      value: res[i].cn,
+    });
+  }
+}
+
+// 查看详情
+const handleView = async (record) => {
+  detailParmas.shortHour = record.shortHour;
+  loadDetailDate();
+}
+
+// 查看详情
+async function loadDetailDate(){
+  detailVisible.value = true;
+  try {
+    confirmLoading.value = true;
+    detailData.value = [];
+    const res = await orderList({ beginTime:parmas.beginTime,endTime:parmas.endTime,housingestateId:parmas.housingestateId,invalid:detailParmas.invalid,shortHour:detailParmas.shortHour });
+    detailData.value = res;
+    confirmLoading.value = false;
+  } catch (error) {
+    console.error('获取详情失败:', error);
+  }
+}
+
+function getPreviousDate(days) {
+  const date = new Date();
+  date.setDate(date.getDate() - days);
+  const year = date.getFullYear();
+  const month = String(date.getMonth() + 1).padStart(2, '0'); // 月份+1（0-indexed）并补零
+  const day = String(date.getDate()).padStart(2, '0');         // 日期补零
+  const formattedDate = `${year}-${month}-${day}`;
+  return formattedDate;
+}
+
+onMounted(() => {
+  if (parmas.type == '1') {
+    parmas.beginTime = getPreviousDate(0) + ' 00:00:00';
+    parmas.endTime = getPreviousDate(0) + ' 23:59:59';
+  }
+  loadDate();
+  getHousingestates();
+})
+
+</script>
diff --git a/src/views/zh/order/sjdtdje/index.vue b/src/views/zh/order/sjdtdje/index.vue
new file mode 100644
index 0000000..d784101
--- /dev/null
+++ b/src/views/zh/order/sjdtdje/index.vue
@@ -0,0 +1,182 @@
+<template>
+  <div class="p-4">
+    <a-card :bordered="false" style="height: 100%">
+      <a-row>
+        <a-col :span="21">
+          <a-radio-group v-model:value="parmas.type" @change="changeType">
+            <a-radio-button value="1">当天</a-radio-button>
+            <a-radio-button value="2">近3天</a-radio-button>
+            <a-radio-button value="3">近7天</a-radio-button>
+            <a-radio-button value="4">近30天</a-radio-button>
+            <a-radio-button value="5">自定义</a-radio-button>
+          </a-radio-group>
+          <span v-show="parmas.type == '5'" style="margin-left: 5px;">
+            <a-range-picker :value-format="valueFormat" @change="changeDate" />
+          </span>
+          <a-select ref="select" placeholder="请选区域" v-model:value="parmas.housingestateId"
+                    style="width: 200px;margin-left: 5px;" @change="handleHousinges">
+            <a-select-option value="">全部</a-select-option>
+            <a-select-option :value="item.housingestateId" v-for="item in housingestates" :key="item.housingestateId">{{item.housingestateName }}</a-select-option>
+          </a-select>
+        </a-col>
+        <a-col :span="3">
+          <a-radio-group v-model:value="izList" button-style="solid" @change="loadDate">
+            <a-radio-button :value="false">统计图</a-radio-button>
+            <a-radio-button :value="true">列表页</a-radio-button>
+          </a-radio-group>
+        </a-col>
+      </a-row>
+      <Bar v-show="!izList" :chartData="dataSource" height="75vh" :option="{ title: { text: '时间段投递订单金额统计', left: 'center' }}" :itemStyle="{ normal: {label : {show: true, position: 'top'}}}" :seriesName="'投递金额'"></Bar>
+      <div  v-show="izList" style="margin-top: 20px;">
+        <a-table :dataSource="dataSource" :columns="sjdtdjeColumns" :pagination="false">
+          <template #bodyCell="{ column, record }">
+            <template v-if="column.key === 'action'">
+              <a-button type="link" @click="handleView(record)">查看</a-button>
+            </template>
+          </template>
+        </a-table>
+      </div>
+    </a-card>
+    <a-modal v-model:visible="detailVisible" title="订单详情" width="80%" :footer="null">
+      <a-spin :spinning="confirmLoading">
+        <a-row>
+          <a-col :span="20">
+            <div style="margin: 5px 0px 5px 20px">订单状态
+              <a-select ref="select"
+                        placeholder="请选订单状态"
+                        v-model:value="detailParmas.invalid"
+                        style="width: 200px;margin-left: 5px;"
+                        @change="loadDetailDate">
+                <a-select-option value="" >全部</a-select-option>
+                <a-select-option value="0">正常</a-select-option>
+                <a-select-option value="1">违规</a-select-option>
+                <a-select-option value="2">部分违规</a-select-option>
+                <a-select-option value="3">待审核</a-select-option>
+                <a-select-option value="4">异常</a-select-option>
+                <a-select-option value="5">忽略</a-select-option>
+              </a-select>
+            </div>
+          </a-col>
+        </a-row>
+        <a-table :dataSource="detailData" :columns="detailColumns" rowKey="rowNumber">
+        </a-table>
+      </a-spin>
+    </a-modal>
+  </div>
+</template>
+
+<script lang="ts" setup>
+import { ref, unref, reactive, onMounted } from 'vue';
+import Bar from '/@/components/chart/Bar.vue';
+import { housingestateList,sjdtdjeList,orderList } from '../order.api';
+import { sjdtdjeColumns,detailColumns } from '../order.data';
+
+const valueFormat = 'YYYY-MM-DD';
+const dataSource = ref([]);
+const dateValue = ref();
+const housingestates = ref();
+const izList = ref(false)
+const detailVisible = ref(false);
+const confirmLoading = ref(false);
+const detailData = ref([]);
+
+async function getHousingestates(){
+  housingestates.value = await housingestateList();
+}
+
+const parmas = reactive<any>({
+  beginTime: '',
+  endTime: '',
+  type: '1',
+  housingestateId: '',
+})
+
+function handleHousinges(){
+  loadDate();
+};
+
+
+const detailParmas = reactive<any>({
+  housingestateId: '',
+  invalid: '',
+  shortHour: '',
+})
+
+function changeType() {
+  parmas.endTime = getPreviousDate(0) + ' 23:59:59';
+  if (parmas.type === '1') {
+    parmas.beginTime = getPreviousDate(0) + ' 00:00:00';
+    loadDate();
+  }
+  if (parmas.type === '2') {
+    parmas.beginTime = getPreviousDate(2) + ' 00:00:00';
+    loadDate();
+  }
+  if (parmas.type === '3') {
+    parmas.beginTime = getPreviousDate(6) + ' 00:00:00';
+    loadDate();
+  }
+  if (parmas.type === '4') {
+    parmas.beginTime = getPreviousDate(29) + ' 00:00:00';
+    loadDate();
+  }
+}
+
+const changeDate = (date, dateString) => {
+  parmas.beginTime = dateString[0] + ' 00:00:00';
+  parmas.endTime = dateString[1] + ' 23:59:59';
+  loadDate();
+};
+
+async function loadDate() {
+  const res = await sjdtdjeList(parmas);
+  dataSource.value = [];
+  for (let i = 0; i < res.length; i++) {
+    dataSource.value.push({
+      shortHour: `${res[i].shortHour}`,
+      name: `${res[i].shortHour}时`,
+      value: res[i].money,
+    });
+  }
+}
+
+// 查看详情
+const handleView = async (record) => {
+  detailParmas.shortHour = record.shortHour;
+  loadDetailDate();
+}
+
+// 查看详情
+async function loadDetailDate(){
+  detailVisible.value = true;
+  try {
+    confirmLoading.value = true;
+    detailData.value = [];
+    const res = await orderList({ beginTime:parmas.beginTime,endTime:parmas.endTime,housingestateId:parmas.housingestateId,invalid:detailParmas.invalid,shortHour:detailParmas.shortHour });
+    detailData.value = res;
+    confirmLoading.value = false;
+  } catch (error) {
+    console.error('获取详情失败:', error);
+  }
+}
+
+function getPreviousDate(days) {
+  const date = new Date();
+  date.setDate(date.getDate() - days);
+  const year = date.getFullYear();
+  const month = String(date.getMonth() + 1).padStart(2, '0'); // 月份+1（0-indexed）并补零
+  const day = String(date.getDate()).padStart(2, '0');         // 日期补零
+  const formattedDate = `${year}-${month}-${day}`;
+  return formattedDate;
+}
+
+onMounted(() => {
+  if (parmas.type == '1') {
+    parmas.beginTime = getPreviousDate(0) + ' 00:00:00';
+    parmas.endTime = getPreviousDate(0) + ' 23:59:59';
+  }
+  loadDate();
+  getHousingestates();
+})
+
+</script>
diff --git a/src/views/zh/order/wgddjetj/index.vue b/src/views/zh/order/wgddjetj/index.vue
new file mode 100644
index 0000000..f5934ed
--- /dev/null
+++ b/src/views/zh/order/wgddjetj/index.vue
@@ -0,0 +1,160 @@
+<template>
+  <div class="p-4">
+    <a-card :bordered="false" style="height: 100%">
+      <a-row>
+        <a-col :span="21">
+          <a-radio-group v-model:value="parmas.type" @change="changeType">
+            <a-radio-button value="1">近7天</a-radio-button>
+            <a-radio-button value="2">近30天</a-radio-button>
+            <a-radio-button value="3">自定义</a-radio-button>
+          </a-radio-group>
+          <span v-show="parmas.type == '3'" style="margin-left: 5px;">
+            <a-range-picker :value-format="valueFormat" @change="changeDate" />
+          </span>
+        </a-col>
+        <a-col :span="3">
+          <a-radio-group v-model:value="izList" button-style="solid" @change="loadDate">
+            <a-radio-button :value="false">统计图</a-radio-button>
+            <a-radio-button :value="true">列表页</a-radio-button>
+          </a-radio-group>
+        </a-col>
+      </a-row>
+      <LineMulti v-show="!izList" :chartData="dataSource" height="75vh"
+        :option="{ title: { text: '违规订单金额统计', left: 'center' } }"
+                 :seriesLabel="{show: true, position: 'top'}" type="line"></LineMulti>
+      <div  v-show="izList" style="margin-top: 20px;">
+        <a-table :dataSource="dataSource" :columns="sjdtdjeColumns">
+          <template #bodyCell="{ column, record }">
+            <template v-if="column.key === 'action'">
+              <a-button type="link" @click="handleView(record)">查看</a-button>
+            </template>
+          </template>
+        </a-table>
+      </div>
+    </a-card>
+    <a-modal v-model:visible="detailVisible" title="订单详情" width="80%" :footer="null">
+      <a-spin :spinning="confirmLoading">
+        <a-row>
+          <a-col :span="20">
+            <div style="margin: 5px 0px 5px 20px">订单状态
+              <a-select ref="select"
+                        placeholder="请选订单状态"
+                        v-model:value="detailParmas.invalid"
+                        style="width: 200px;margin-left: 5px;"
+                        @change="loadDetailDate">
+                <a-select-option value="" >全部</a-select-option>
+                <a-select-option value="1">违规</a-select-option>
+                <a-select-option value="2">部分违规</a-select-option>
+              </a-select>
+            </div>
+          </a-col>
+        </a-row>
+        <a-table :dataSource="detailData" :columns="detailColumns" rowKey="rowNumber">
+        </a-table>
+      </a-spin>
+    </a-modal>
+  </div>
+</template>
+
+<script lang="ts" setup>
+import { ref, unref, reactive, onMounted } from 'vue';
+import LineMulti from '/@/components/chart/LineMulti.vue';
+import {wgOrderList, wgddjetjList} from '../order.api';
+import { sjdtdjeColumns,detailColumns } from '../order.data';
+
+const valueFormat = 'YYYY-MM-DD';
+const dataSource = ref([]);
+const dateValue = ref();
+const staffs = ref();
+const izList = ref(false)
+const detailVisible = ref(false);
+const confirmLoading = ref(false);
+const detailData = ref([]);
+
+const parmas = reactive<any>({
+  beginTime: '',
+  endTime: '',
+  type: '1',
+})
+
+const detailParmas = reactive<any>({
+  invalid: '',
+  beginTime: '',
+  endTime: '',
+})
+
+function changeType() {
+  if (parmas.type === '1') {
+    parmas.beginTime = getPreviousDate(6) + ' 00:00:00';
+    loadDate();
+  }
+  if (parmas.type === '2') {
+    parmas.beginTime = getPreviousDate(29) + ' 00:00:00';
+    loadDate();
+  }
+}
+
+const changeDate = (date, dateString) => {
+  parmas.beginTime = dateString[0] + ' 00:00:00';
+  parmas.endTime = dateString[1] + ' 23:59:59';
+  loadDate();
+};
+
+async function loadDate() {
+  if(izList.value){
+    parmas.pageSize=-1
+  }else{
+    parmas.pageSize=10
+  }
+  const res = await wgddjetjList(parmas);
+  dataSource.value = [];
+  for (let i = 0; i < res.length; i++) {
+    dataSource.value.push({
+      type: '金额',
+      rowNumber: res[i].rowNumber,
+      name: `${res[i].shortDay}`,
+      value: res[i].money,
+    });
+  }
+}
+
+// 查看详情
+const handleView = async (record) => {
+  detailParmas.beginTime = record.name+' 00:00:00';
+  detailParmas.endTime = record.name+' 23:59:59';
+  loadDetailDate();
+}
+
+// 查看详情
+async function loadDetailDate(){
+  detailVisible.value = true;
+  try {
+    confirmLoading.value = true;
+    detailData.value = [];
+    const res = await wgOrderList({ beginTime:detailParmas.beginTime,endTime:detailParmas.endTime,invalid:detailParmas.invalid });
+    detailData.value = res;
+    confirmLoading.value = false;
+  } catch (error) {
+    console.error('获取详情失败:', error);
+  }
+}
+
+function getPreviousDate(days) {
+  const date = new Date();
+  date.setDate(date.getDate() - days);
+  const year = date.getFullYear();
+  const month = String(date.getMonth() + 1).padStart(2, '0'); // 月份+1（0-indexed）并补零
+  const day = String(date.getDate()).padStart(2, '0');         // 日期补零
+  const formattedDate = `${year}-${month}-${day}`;
+  return formattedDate;
+}
+
+onMounted(() => {
+  if (parmas.type == '1') {
+    parmas.beginTime = getPreviousDate(6) + ' 00:00:00';
+    parmas.endTime = getPreviousDate(0) + ' 23:59:59';
+  }
+  loadDate();
+})
+
+</script>
diff --git a/src/views/zh/qy/qy.data.ts b/src/views/zh/qy/qy.data.ts
index d3df94c..767f330 100644
--- a/src/views/zh/qy/qy.data.ts
+++ b/src/views/zh/qy/qy.data.ts
@@ -1,9 +1,4 @@
 import {BasicColumn} from '/@/components/Table';
-import {FormSchema} from '/@/components/Table';
-import { rules} from '/@/utils/helper/validator';
-import { render } from '/@/utils/common/renderUtils';
-import { getWeekMonthQuarterYear } from '/@/utils';
-import {ref} from "vue";
 
 export const detailSjqyColumns : BasicColumn[] =[
   {
@@ -166,7 +161,6 @@ export const sjdqycsColumns : BasicColumn[] =[
   }
 ]
 
-
 export const sjdqyzlColumns : BasicColumn[] =[
   {
     title: '时间',
diff --git a/src/views/zh/qy/sjdcs/index.vue b/src/views/zh/qy/sjdcs/index.vue
index 49ffe45..dacfe8d 100644
--- a/src/views/zh/qy/sjdcs/index.vue
+++ b/src/views/zh/qy/sjdcs/index.vue
@@ -26,7 +26,7 @@
           </a-radio-group>
         </a-col>
       </a-row>
-      <Bar v-show="!izList" :chartData="dataSource" height="80vh" :option="{ title: { text: '时间段清运次数统计', left: 'center' }}" :itemStyle="{ normal: {label : {show: true, position: 'top'}}}" :seriesName="'清运次数'"></Bar>
+      <Bar v-show="!izList" :chartData="dataSource" height="75vh" :option="{ title: { text: '时间段清运次数统计', left: 'center' }}" :itemStyle="{ normal: {label : {show: true, position: 'top'}}}" :seriesName="'清运次数'"></Bar>
       <div  v-show="izList" style="margin-top: 20px;">
         <a-table :dataSource="dataSource" :columns="sjdqycsColumns" :pagination="false">
           <template #bodyCell="{ column, record }">
diff --git a/src/views/zh/qy/sjdzl/index.vue b/src/views/zh/qy/sjdzl/index.vue
index 461d065..0fbca5d 100644
--- a/src/views/zh/qy/sjdzl/index.vue
+++ b/src/views/zh/qy/sjdzl/index.vue
@@ -29,7 +29,7 @@
           </a-radio-group>
         </a-col>
       </a-row>
-      <Bar v-show="!izList" :chartData="dataSource" height="80vh" :option="{ title: { text: '时间段清运重量统计', left: 'center' }}" :itemStyle="{ normal: {label : {show: true, position: 'top'}}}" :seriesName="'清运重量(吨)'"></Bar>
+      <Bar v-show="!izList" :chartData="dataSource" height="75vh" :option="{ title: { text: '时间段清运重量统计', left: 'center' }}" :itemStyle="{ normal: {label : {show: true, position: 'top'}}}" :seriesName="'清运重量(吨)'"></Bar>
       <div  v-show="izList" style="margin-top: 20px;">
         <a-table :dataSource="dataSource" :columns="sjdqyzlColumns" :pagination="false">
           <template #bodyCell="{ column, record }">
diff --git a/src/views/zh/qy/sjqycs/index.vue b/src/views/zh/qy/sjqycs/index.vue
index 9d1526f..f4bf3d4 100644
--- a/src/views/zh/qy/sjqycs/index.vue
+++ b/src/views/zh/qy/sjqycs/index.vue
@@ -26,7 +26,7 @@
           </a-radio-group>
         </a-col>
       </a-row>
-      <LineMulti v-show="!izList" :chartData="dataSource" height="80vh"
+      <LineMulti v-show="!izList" :chartData="dataSource" height="75vh"
         :option="{ title: { text: '货运司机清运次数统计', left: 'center' } }"
                  :seriesLabel="{show: true, position: 'top'}" type="line"></LineMulti>
       <div  v-show="izList" style="margin-top: 20px;">
diff --git a/src/views/zh/qy/sjqyzl/index.vue b/src/views/zh/qy/sjqyzl/index.vue
index 91240be..7221c1c 100644
--- a/src/views/zh/qy/sjqyzl/index.vue
+++ b/src/views/zh/qy/sjqyzl/index.vue
@@ -26,7 +26,7 @@
           </a-radio-group>
         </a-col>
       </a-row>
-      <LineMulti v-show="!izList" :chartData="dataSource" height="80vh"
+      <LineMulti v-show="!izList" :chartData="dataSource" height="75vh"
         :option="{ title: { text: '货运司机清运重量统计', left: 'center' } }"
                  :seriesLabel="{show: true, position: 'top'}" type="line"></LineMulti>
       <div  v-show="izList" style="margin-top: 20px;">
diff --git a/src/views/zh/qy/xqqycs/index.vue b/src/views/zh/qy/xqqycs/index.vue
index eb3cc7d..cfa23e7 100644
--- a/src/views/zh/qy/xqqycs/index.vue
+++ b/src/views/zh/qy/xqqycs/index.vue
@@ -26,7 +26,7 @@
           </a-radio-group>
         </a-col>
       </a-row>
-      <Bar v-show="!izList" :chartData="dataSource" height="80vh"
+      <Bar v-show="!izList" :chartData="dataSource" height="75vh"
         :option="{ title: { text: '小区清运次数排行榜', left: 'center' } }"
         :itemStyle="{ normal: { label: { show: true, position: 'top' } } }"
         :axisLabel="{ rotate: 45}"
diff --git a/src/views/zh/shebei/shebei.data.ts b/src/views/zh/shebei/shebei.data.ts
index 7675cdc..549c7c1 100644
--- a/src/views/zh/shebei/shebei.data.ts
+++ b/src/views/zh/shebei/shebei.data.ts
@@ -1,9 +1,4 @@
 import {BasicColumn} from '/@/components/Table';
-import {FormSchema} from '/@/components/Table';
-import { rules} from '/@/utils/helper/validator';
-import { render } from '/@/utils/common/renderUtils';
-import { getWeekMonthQuarterYear } from '/@/utils';
-import {ref} from "vue";
 //列表数据
 export const tdcsColumns : BasicColumn[] =[
   {
diff --git a/src/views/zh/shebei/tdcs/index.vue b/src/views/zh/shebei/tdcs/index.vue
index 4212d3e..f17c645 100644
--- a/src/views/zh/shebei/tdcs/index.vue
+++ b/src/views/zh/shebei/tdcs/index.vue
@@ -26,7 +26,7 @@
           </a-radio-group>
         </a-col>
       </a-row>
-      <Bar v-show="!izList" :chartData="dataSource" height="80vh"
+      <Bar v-show="!izList" :chartData="dataSource" height="75vh"
         :option="{ title: { text: '设备投递次数排行榜', left: 'center' } }"
         :itemStyle="{ normal: { label: { show: true, position: 'top' } } }"
         :axisLabel="{ rotate: 45}"
diff --git a/src/views/zh/shebei/tdcstj/index.vue b/src/views/zh/shebei/tdcstj/index.vue
index 3eea7cd..5699ccb 100644
--- a/src/views/zh/shebei/tdcstj/index.vue
+++ b/src/views/zh/shebei/tdcstj/index.vue
@@ -23,7 +23,7 @@
       </a-row>
       <a-row style="margin-top:10px">
 <!--        <BaseAreaLine :chartData="dataSource" height="80vh" :option="{ title: { text: '投递订单次数统计', left: 'center' }}" :seriesLabel="{show: true, position: 'top'}" :seriesName="'投递次数'"></BaseAreaLine>-->
-        <LineMulti :chartData="dataSource" height="80vh" :option="{ title: { text: '投递订单次数统计', left: 'center' }}" :seriesLabel="{show: true, position: 'top'}" type="line"></LineMulti>
+        <LineMulti :chartData="dataSource" height="72vh" :option="{ title: { text: '投递订单次数统计', left: 'center' }}" :seriesLabel="{show: true, position: 'top'}" type="line"></LineMulti>
       </a-row>
     </a-card>
   </div>
diff --git a/src/views/zh/shebei/tdjetj/index.vue b/src/views/zh/shebei/tdjetj/index.vue
index a151293..aa14630 100644
--- a/src/views/zh/shebei/tdjetj/index.vue
+++ b/src/views/zh/shebei/tdjetj/index.vue
@@ -23,7 +23,7 @@
       </a-row>
       <a-row style="margin-top:10px">
 <!--        <BaseAreaLine :chartData="dataSource" height="80vh" :option="{ title: { text: '投递订单金额统计', left: 'center' }}" :seriesLabel="{show: true, position: 'top'}" :seriesName="'金额'"></BaseAreaLine>-->
-        <LineMulti :chartData="dataSource" height="80vh" :option="{ title: { text: '投递订单金额统计', left: 'center' }}" :seriesLabel="{show: true, position: 'top'}" type="line"></LineMulti>
+        <LineMulti :chartData="dataSource" height="72vh" :option="{ title: { text: '投递订单金额统计', left: 'center' }}" :seriesLabel="{show: true, position: 'top'}" type="line"></LineMulti>
       </a-row>
     </a-card>
   </div>
diff --git a/src/views/zh/shebei/tdzl/index.vue b/src/views/zh/shebei/tdzl/index.vue
index b30e4b8..4a23eee 100644
--- a/src/views/zh/shebei/tdzl/index.vue
+++ b/src/views/zh/shebei/tdzl/index.vue
@@ -26,7 +26,7 @@
           </a-radio-group>
         </a-col>
       </a-row>
-      <Bar v-show="!izList" :chartData="dataSource" height="80vh"
+      <Bar v-show="!izList" :chartData="dataSource" height="75vh"
         :option="{ title: { text: '设备投递重量排行榜', left: 'center' } }"
         :itemStyle="{ normal: { label: { show: true, position: 'top' } } }"
         :axisLabel="{ rotate: 45}"