From 79effaa17fef222c8d589a73904cc970a7efa690 Mon Sep 17 00:00:00 2001
From: weiyin <yin.wei@le9health.com>
Date: Mon, 26 Aug 2024 21:01:10 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E8=BF=90=E8=90=A5=E7=9B=91=E6=8E=A7?=
 =?UTF-8?q?=E6=89=8B=E6=9C=AF=E9=87=8F=E7=BB=9F=E8=AE=A1=E5=92=8C=E7=A7=91?=
 =?UTF-8?q?=E5=AE=A4=E6=89=8B=E6=9C=AF=E9=87=8F=E7=BB=9F=E8=AE=A1=E6=A8=A1?=
 =?UTF-8?q?=E5=9D=97=E4=BA=92=E6=8D=A2=E5=8F=8Aechart=E5=8C=BA=E5=9F=9F?=
 =?UTF-8?q?=E5=AE=BD=E9=AB=98=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../pageMonitor/bottomLeft/OpHistogram.vue    |  1 +
 src/views/pageMonitor/bottomLeft/index.vue    | 51 ++++++++++++-------
 .../pageMonitor/bottomRight/DepHistogram.vue  |  2 +
 src/views/pageMonitor/bottomRight/index.vue   | 19 ++++---
 4 files changed, 47 insertions(+), 26 deletions(-)

diff --git a/src/views/pageMonitor/bottomLeft/OpHistogram.vue b/src/views/pageMonitor/bottomLeft/OpHistogram.vue
index d048d16..0a730c7 100644
--- a/src/views/pageMonitor/bottomLeft/OpHistogram.vue
+++ b/src/views/pageMonitor/bottomLeft/OpHistogram.vue
@@ -165,6 +165,7 @@ export default {
         grid: {
           height: "80%",
           top: "8%",
+          right: 0,
           // bottom: "5%",
         },
         xAxis: {
diff --git a/src/views/pageMonitor/bottomLeft/index.vue b/src/views/pageMonitor/bottomLeft/index.vue
index b6979c1..6880ab4 100644
--- a/src/views/pageMonitor/bottomLeft/index.vue
+++ b/src/views/pageMonitor/bottomLeft/index.vue
@@ -4,22 +4,26 @@
     v-loading="isLoading"
   >
     <div
-      class="w-[12.4vh] h-[5.07vh] ml-[1.85vh] flex justify-between items-center"
+      class="w-[45%] h-[5.07vh] ml-[1.85vh] flex justify-between items-center"
     >
       <img src="@/assets/svg/Monitor/Triangle.svg" />
-      <span class="text-[2.03vh] youshe leading-none">手术量统计</span>
-    </div>
-    <div class="w-[42.96vh] h-[27.12vh] ml-[2.96vh] my-[3.7vh]">
-      <Histogram
-        v-if="getDataList.length"
-        :getDataList="getDataList"
-      ></Histogram>
-      <div
-        v-else
-        class="flex flex-col w-[100%] h-[100%] items-center justify-center"
+      <span class="text-[2.03vh] youshe leading-none"
+        >科室手术量统计(前五)</span
       >
-        <img src="@/assets/img/noData.png" class="w-[120px]" />
-        <span>暂无数据</span>
+    </div>
+    <div class="w-[42.96vh] ml-[2.96vh] deptBody">
+      <div class="h-[30vh] w-full">
+        <Histogram
+          v-if="getDataList.length"
+          :getDataList="getDataList"
+        ></Histogram>
+        <div
+          v-else
+          class="flex flex-col w-[100%] h-[100%] items-center justify-center"
+        >
+          <img src="@/assets/img/noData.png" class="w-[120px]" />
+          <span>暂无数据</span>
+        </div>
       </div>
     </div>
     <div
@@ -43,10 +47,12 @@
 </template>
 
 <script>
-import { GetMonitorOperationNumber } from "@/api/monitor";
+// import { GetMonitorOperationNumber } from "@/api/monitor";
+import { GetMonitorOperationDept } from "@/api/monitor";
 import dayjs from "dayjs";
-import Histogram from "./OpHistogram.vue";
-
+// import Histogram from "./OpHistogram.vue";
+// import Histogram from "@/views/pageMonitor/bottomLeft/OpHistogram.vue";
+import Histogram from "@/views/pageMonitor/bottomRight/DepHistogram.vue";
 export default {
   data() {
     return {
@@ -67,11 +73,13 @@ export default {
   methods: {
     onGetPageData() {
       this.isLoading = true;
-      GetMonitorOperationNumber({
+      GetMonitorOperationDept({
         startDate: this.startDate,
         endDate: this.endDate,
       }).then((res) => {
-        this.getDataList = [res["data"]] || [];
+        // this.getDataList = [res["data"]] || [];
+        // this.isLoading = false;
+        this.getDataList = res["data"] || [];
         this.isLoading = false;
       });
     },
@@ -120,4 +128,11 @@ export default {
 .bgMonthBox {
   background-image: url("@/assets/svg/Monitor/BottomLeft/MonthActive.svg");
 }
+
+.deptBody {
+  height: calc(100% - 5.07vh);
+  display: flex;
+  justify-content: center;
+  align-items: center;
+}
 </style>
diff --git a/src/views/pageMonitor/bottomRight/DepHistogram.vue b/src/views/pageMonitor/bottomRight/DepHistogram.vue
index 557c6e2..e6110ce 100644
--- a/src/views/pageMonitor/bottomRight/DepHistogram.vue
+++ b/src/views/pageMonitor/bottomRight/DepHistogram.vue
@@ -168,6 +168,8 @@ export default {
         grid: {
           height: "80%",
           top: "8%",
+          right: 0,
+          bottom: 0,
           // bottom: "5%",
         },
         xAxis: {
diff --git a/src/views/pageMonitor/bottomRight/index.vue b/src/views/pageMonitor/bottomRight/index.vue
index b49a315..d9110a9 100644
--- a/src/views/pageMonitor/bottomRight/index.vue
+++ b/src/views/pageMonitor/bottomRight/index.vue
@@ -4,12 +4,10 @@
     v-loading="isLoading"
   >
     <div
-      class="w-[20.8vh] h-[5.07vh] ml-[1.85vh] flex justify-between items-center"
+      class="w-[34%] h-[5.07vh] ml-[1.85vh] flex justify-between items-center"
     >
       <img src="@/assets/svg/Monitor/Triangle.svg" />
-      <span class="text-[2.03vh] youshe leading-none"
-        >科室手术量统计(前五)</span
-      >
+      <span class="text-[2.03vh] youshe leading-none">手术量统计</span>
     </div>
     <div class="w-[35.46vh] h-[28.05vh] ml-[2.4vh] my-[3.7vh]">
       <!-- <div ref="echartsContainer"></div> -->
@@ -46,9 +44,11 @@
 </template>
 
 <script>
-import { GetMonitorOperationDept } from "@/api/monitor";
+import { GetMonitorOperationNumber } from "@/api/monitor";
 import dayjs from "dayjs";
-import Histogram from "./DepHistogram.vue";
+// import Histogram from "./DepHistogram.vue";
+// import Histogram from "@/views/pageMonitor/bottomRight/DepHistogram.vue"
+import Histogram from "@/views/pageMonitor/bottomLeft/OpHistogram.vue";
 
 export default {
   data() {
@@ -70,11 +70,14 @@ export default {
   methods: {
     onGetPageData() {
       this.isLoading = true;
-      GetMonitorOperationDept({
+      GetMonitorOperationNumber({
         startDate: this.startDate,
         endDate: this.endDate,
       }).then((res) => {
-        this.getDataList = res["data"] || [];
+        // this.getDataList = res["data"] || [];
+        // this.isLoading = false;
+
+        this.getDataList = [res["data"]] || [];
         this.isLoading = false;
       });
     },