From 71f72ff03ddfe0e2fc12623ce10d1f96646c138b Mon Sep 17 00:00:00 2001
From: YuanHuakk <1751826683@qq.com>
Date: Sat, 9 Mar 2024 18:17:51 +0800
Subject: [PATCH] =?UTF-8?q?feat(custom):=20=E5=A2=9E=E5=8A=A0=E5=90=8E?=
 =?UTF-8?q?=E7=BB=93=E7=BB=9F=E8=AE=A1=E6=97=B6=E9=97=B4=E7=AD=9B=E9=80=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .drone.yml                                    |  2 +-
 src/views/order/pengding_order_data/index.vue | 36 ++++++++++++++++++-
 2 files changed, 36 insertions(+), 2 deletions(-)

diff --git a/.drone.yml b/.drone.yml
index 16cd62f..9ed1c60 100644
--- a/.drone.yml
+++ b/.drone.yml
@@ -122,7 +122,7 @@ steps:
         - tar -xzvf dist.tar -C /www/builder/jdt-mer-prod
         - rm -rf dist.tar
         - cd jdt-mer-prod
-        - cd docker build -t jdt-mer-prod .
+        - docker build -t jdt-mer-prod .
         - docker stop jdt-mer-prod
         - docker rm jdt-mer-prod
         - docker run -d -p 8083:80 --restart=always --name jdt-mer-prod jdt-mer-prod
diff --git a/src/views/order/pengding_order_data/index.vue b/src/views/order/pengding_order_data/index.vue
index 70b4eb8..b6bc961 100644
--- a/src/views/order/pengding_order_data/index.vue
+++ b/src/views/order/pengding_order_data/index.vue
@@ -1,5 +1,25 @@
 <template>
   <CommonPage show-footer :title="$route.title">
+    <n-grid mb-10 flex items-center x-gap="10" :y-gap="8" :cols="3">
+      <n-gi>
+        <!-- {{ queryData }} -->
+        <div flex items-center>
+          <span w-120>时间筛选：</span>
+          <n-date-picker
+            v-model:formatted-value="queryData.time"
+            value-format="yyyy-MM-dd HH:mm:ss"
+            type="datetimerange"
+            clearable
+          />
+        </div>
+      </n-gi>
+      <n-gi>
+        <div>
+          <n-button type="primary" @click="get_data">搜索</n-button>
+          <n-button ml-10 @click="clear">重置</n-button>
+        </div>
+      </n-gi>
+    </n-grid>
     <n-card mb-5 rounded-5 title="营业额汇总">
       <n-grid x-gap="10" :y-gap="8" :cols="4">
         <n-gi>
@@ -67,6 +87,10 @@ const cardData = ref({})
 
 const loading = ref(false)
 
+const queryData = ref({
+  time: null,
+})
+
 const option = ref({
   tooltip: {
     trigger: 'axis',
@@ -91,6 +115,7 @@ const option = ref({
     {
       data: [],
       type: 'bar',
+      barWidth: '10%',
       name: '金额（元）',
       label: {
         show: true,
@@ -119,7 +144,11 @@ const get_data = async () => {
   loading.value = true
   option.value.xAxis.data = []
   option.value.series[0].data = []
-  const res = await api.getData()
+  const query_data = {
+    StartTime: queryData.value.time === null ? '' : queryData.value.time[0] || '',
+    EndTime: queryData.value.time === null ? '' : queryData.value.time[1] || '',
+  }
+  const res = await api.getData(query_data)
   cardData.value = res.data
   for (let i = 0; i < res.data.data.length; i++) {
     option.value.xAxis.data.push(res.data.data[i].Name)
@@ -128,6 +157,11 @@ const get_data = async () => {
   console.log(cardData.value)
   loading.value = false
 }
+
+const clear = async () => {
+  queryData.value.time = null
+  get_data()
+}
 </script>
 
 <style lang="scss" scoped>