From 9f71d368b5632e404ec3807e8650f401defb54d7 Mon Sep 17 00:00:00 2001
From: sjh <shujiehao@foxmail.com>
Date: Wed, 30 Oct 2024 14:54:01 +0800
Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E7=BB=B4=E6=9D=83=E6=8A=9A?=
 =?UTF-8?q?=E6=85=B0=E5=A4=A7=E5=B1=8F=EF=BC=9A=E6=8A=9A=E6=85=B0=E7=9B=B8?=
 =?UTF-8?q?=E5=85=B3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/datav.ts                   |  6 +++
 src/components/datav/statistic.vue |  2 +-
 src/views/datav/RightsComfort.vue  | 85 +++++++++++++++++++-----------
 3 files changed, 60 insertions(+), 33 deletions(-)

diff --git a/src/api/datav.ts b/src/api/datav.ts
index 37d0bf5..768c59d 100644
--- a/src/api/datav.ts
+++ b/src/api/datav.ts
@@ -4,4 +4,10 @@ export function getCaseVerifData(times) {
     return request.get({
         url: `/datav/caseVerif?beginTime=${times[0]}&endTime=${times[1]}`
     });
+}
+
+export function getRightsComfortData(times) {
+    return request.get({
+        url: `/datav/rightsComfort?beginTime=${times[0]}&endTime=${times[1]}`
+    });
 }
\ No newline at end of file
diff --git a/src/components/datav/statistic.vue b/src/components/datav/statistic.vue
index 8969793..63231ec 100644
--- a/src/components/datav/statistic.vue
+++ b/src/components/datav/statistic.vue
@@ -1,7 +1,7 @@
 <template>
     <div class="statistic">
         <div class="statistic-number">
-            {{ parseInt(outputValue) }}{{ valueUnit }}
+            {{ (outputValue) }}{{ valueUnit }}
         </div>
         <div class="statistic-title">{{ title }}</div>
     </div>
diff --git a/src/views/datav/RightsComfort.vue b/src/views/datav/RightsComfort.vue
index 82b0dab..277c71b 100644
--- a/src/views/datav/RightsComfort.vue
+++ b/src/views/datav/RightsComfort.vue
@@ -34,10 +34,7 @@
                         </datav-card>
                     </el-col>
                     <el-col :span="12">
-                        <div class="datav-col">
-                            <label for="">统计周期：</label>
-                            <span>2024年01月01日 - 2024年08月30日</span>
-                        </div>
+                      <datav-date-picker v-model="time" />
                         <div class="flex gap-42">
                             <datav-statistic
                                 :value="136"
@@ -50,17 +47,17 @@
                                 style="width: 20%"
                             />
                             <datav-statistic
-                                :value="89"
+                                :value="comfortPersonNumber"
                                 title="抚慰人数"
                                 style="width: 20%"
                             />
                             <datav-statistic
-                                :value="167"
+                                :value="hitPersonNumber"
                                 title="打击处理人数"
                                 style="width: 20%"
                             />
                             <datav-statistic
-                                :value="21.5"
+                                :value="comfortMoney"
                                 title="&nbsp;&nbsp;&nbsp;&nbsp;抚慰金额（万元）"
                                 style="width: 20%"
                             />
@@ -129,8 +126,36 @@
 import vCharts from "vue-echarts";
 import changshaMap from "@/assets/data/changsha.json";
 import * as echarts from "echarts/core";
+import {getRightsComfortData} from "@/api/datav";
+import moment from "moment";
 
 echarts.registerMap("changsha", changshaMap);
+const time = ref([
+  moment().startOf("year").format("YYYY-MM-DD"),
+  moment().format("YYYY-MM-DD"),
+]);
+const comfortPersonNumber = ref(0);
+const hitPersonNumber = ref(0);
+const comfortMoney = ref(0.0);
+const punishmentSituationList = ref([]);
+const comfortSituationList = ref([]);
+
+function getData() {
+  getRightsComfortData(time.value).then((data) => {
+    console.log('Received data:', data); // 添加日志输出
+    comfortPersonNumber.value = data.comfortPersonNumber;
+    hitPersonNumber.value = data.hitPersonNumber;
+    comfortMoney.value = data.comfortMoney;
+    punishmentSituationList.value = data.punishmentSituation;
+    comfortSituationList.value = data.comfortSituation;
+  });
+}
+watch(time, () => {
+  getData();
+})
+onMounted(() => {
+  getData();
+});
 const option = {
     geo: {
         // 是上面注册时的名字哦，registerMap（'名字保持一致'）
@@ -317,39 +342,35 @@ const option2 = {
     ],
 };
 
-const option3 = {
-    series: [
-        {
+const option3 = computed(() => {
+    return {
+        series: [
+          {
             type: "pie",
             radius: ["40%", "70%"],
             label: {
-                color: "#fff",
+              color: "#fff",
             },
-            data: [
-                { value: 311, name: "刑事追究" },
-                { value: 735, name: "其他处理" },
-                { value: 580, name: "行政处理" }
-            ],
-        },
-    ],
-};
+            data: punishmentSituationList.value,
+          },
+        ],
+    };
+});
 
-const option4 = {
+const option4 = computed(() => {
+  return {
     series: [
-        {
-            type: "pie",
-            radius: ["40%", "70%"],
-            label: {
-                color: "#fff",
-            },
-            data: [
-                { value: 211, name: "民警" },
-                { value: 655, name: "辅警" },
-                { value: 666, name: "协警" }
-            ],
+      {
+        type: "pie",
+        radius: ["40%", "70%"],
+        label: {
+          color: "#fff",
         },
+        data: comfortSituationList.value,
+      },
     ],
-};
+  };
+});
 
 const option6 = {
     series: [