From 1aab61ab13be4278d5531cc752cab68121cdc4e5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E4=B8=8D=E7=88=B1=E5=AD=A6=E4=B9=A0=E7=9A=84=E7=9F=B3?=
 =?UTF-8?q?=E5=90=8C=E5=AD=A6?= <2936013465@qq.com>
Date: Mon, 11 Nov 2024 20:14:28 +0800
Subject: [PATCH] =?UTF-8?q?=E9=A6=96=E9=A1=B5=E5=A4=A7=E5=B1=8F=E5=89=8D?=
 =?UTF-8?q?=E7=AB=AF1.0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/data/basicScreen.ts   |  16 +++
 src/views/data/Mail12337.vue  |   1 +
 src/views/datav/Gobal.vue     | 207 +++++++++++++---------------------
 src/views/datav/SceneInsp.vue | 100 ++++++++--------
 4 files changed, 148 insertions(+), 176 deletions(-)

diff --git a/src/api/data/basicScreen.ts b/src/api/data/basicScreen.ts
index c169a71..0769009 100644
--- a/src/api/data/basicScreen.ts
+++ b/src/api/data/basicScreen.ts
@@ -6,6 +6,9 @@ import request from "@/api/request";
  * @date: 2024-011-7
  */
 
+/*
+ * 获取信息大屏统计数据
+ */
 export function getAllGobalCount(times) {
     return request.get({
         url: `/datav/dataGobalScreen?beginTime=${times[0]}&endTime=${times[1]}`
@@ -13,6 +16,19 @@ export function getAllGobalCount(times) {
 }
 
 
+/**
+ * 获取问题趋势数据
+ */
+export function getGobalRecentlyTrendByMonth(year) {
+    return request.get({
+        url: `/datav/dataGobalScreen/getGobalRecentlyTrendByMonth?year=${year}`
+    });
+}
+
+
+
+
+
 
 
 
diff --git a/src/views/data/Mail12337.vue b/src/views/data/Mail12337.vue
index 3934217..ce9c8dd 100644
--- a/src/views/data/Mail12337.vue
+++ b/src/views/data/Mail12337.vue
@@ -246,6 +246,7 @@ const query = ref({
   current: 1,
   responderKey: "name",
   problemSourcesCode: ProblemSources.XF12337,
+  checkStatus: 1
 });
 
 const list = ref([]);
diff --git a/src/views/datav/Gobal.vue b/src/views/datav/Gobal.vue
index ea4e52a..6c4dd65 100644
--- a/src/views/datav/Gobal.vue
+++ b/src/views/datav/Gobal.vue
@@ -6,7 +6,6 @@
         <el-row :gutter="16">
           <el-col :span="6">
             <datav-card title="机构问题排名" sub-title="问题数">
-
               <datav-tabs
                   v-model="activeOrgTab"
                   type="bottom-button"
@@ -14,7 +13,7 @@
                 <datav-tab-item label="分县市局" name="1">
                   <el-scrollbar height="300px">
                     <datav-chart-bar
-                        :data="data1"
+                        :data="fxsjlist"
                         size="large"
                         :max="11"
                         :color="colors"
@@ -24,7 +23,7 @@
                 <datav-tab-item label="局属单位" name="2">
                   <el-scrollbar height="300px">
                     <datav-chart-bar
-                        :data="data1"
+                        :data="jsdwlist"
                         :max="11"
                         size="large"
                         :color="colors"
@@ -33,60 +32,12 @@
                 </datav-tab-item>
               </datav-tabs>
             </datav-card>
-            <datav-card title="警务评议">
-              <el-row class="mb-32">
-                <el-col :span="6">
-                  <div class="descriptions_cell text-center">
-                    <div class="descriptions_content">
-                      4323
-                    </div>
-                    <div class="descriptions_label">
-                      样本总数
-                    </div>
-                  </div>
-                </el-col>
-                <el-col :span="6">
-                  <div class="descriptions_cell text-center">
-                    <div class="descriptions_content">
-                      4323
-                    </div>
-                    <div class="descriptions_label">
-                      满意/共本满意数
-                    </div>
-                  </div>
-                </el-col>
-                <el-col :span="6">
-                  <div class="descriptions_cell text-center">
-                    <div class="descriptions_content">
-                      2356
-                    </div>
-                    <div class="descriptions_label">
-                      不满意数
-                    </div>
-                  </div>
-                </el-col>
-                <el-col :span="6">
-                  <div class="descriptions_cell text-center">
-                    <div class="descriptions_content">
-                      91%
-                    </div>
-                    <div class="descriptions_label">
-                      满意率
-                    </div>
-                  </div>
-                </el-col>
-              </el-row>
-              <datav-chart-bar
-                  title="满意率排名"
-                  sub-title="满意样本数/样本总数"
-                  :data="data1"
+            <datav-card title="业务类型占比">
+              <v-charts
+                  style="height: 320px"
+                  :option="zfbaPieOption"
+                  autoresize
               />
-              <div class="flex tab-title flex center mt-16">
-                <div class="tab-title-item active">
-                  分县市局
-                </div>
-                <div class="tab-title-item">局属单位</div>
-              </div>
             </datav-card>
           </el-col>
           <el-col :span="12">
@@ -133,7 +84,7 @@
             <datav-card title="问题趋势">
               <v-charts
                   style="height: 300px"
-                  :option="option1"
+                  :option="proTrend"
                   autoresize
               />
             </datav-card>
@@ -194,55 +145,18 @@
                 <div class="tab-title-item">局属单位</div>
               </div>
             </datav-card>
-            <datav-card title="案件核查">
-              <el-row class="mb-32">
-                <el-col :span="8">
-                  <div class="descriptions_cell text-center">
-                    <div class="descriptions_content">
-                      4323
-                    </div>
-                    <div class="descriptions_label">
-                      问题数
-                    </div>
-                  </div>
-                </el-col>
-                <el-col :span="8">
-                  <div class="descriptions_cell text-center">
-                    <div class="descriptions_content">
-                      4323
-                    </div>
-                    <div class="descriptions_label">
-                      问题数
-                    </div>
-                  </div>
-                </el-col>
-                <el-col :span="8">
-                  <div class="descriptions_cell text-center">
-                    <div class="descriptions_content">
-                      91%
-                    </div>
-                    <div class="descriptions_label">
-                      问题数
-                    </div>
-                  </div>
-                </el-col>
-              </el-row>
-              <datav-chart-bar
-                  title="满意率排名"
-                  sub-title="满意样本数/样本总数"
-                  :data="data1"
+            <datav-card title="问题类型占比">
+              <v-charts
+                  style="height: 320px"
+                  :option="zfbaPieOption"
+                  autoresize
               />
-              <div class="flex tab-title flex center mt-16">
-                <div class="tab-title-item active">
-                  分县市局
-                </div>
-                <div class="tab-title-item">局属单位</div>
-              </div>
             </datav-card>
           </el-col>
         </el-row>
       </main>
     </div>
+
   </el-scrollbar>
 </template>
 <script setup>
@@ -251,7 +165,7 @@ import changshaMap from "@/assets/data/changsha.json";
 import * as echarts from "echarts/core";
 import moment from "moment/moment";
 import {getCaseVerifData} from "@/api/datav";
-import {getAllGobalCount} from "@/api/data/basicScreen.ts";
+import {getAllGobalCount, getGobalRecentlyTrendByMonth} from "@/api/data/basicScreen.ts";
 
 const router = useRouter();
 
@@ -301,26 +215,12 @@ const option = {
   ],
 };
 
-const option1 = ref({
+// 问题趋势线状图
+const proTrend =ref({
   xAxis: {
     type: "category",
     boundaryGap: false,
-    data: [
-      "9/10",
-      "9/11",
-      "9/12",
-      "9/13",
-      "9/14",
-      "9/15",
-      "9/16",
-      "9/17",
-      "9/18",
-      "9/19",
-      "9/20",
-      "9/21",
-      "9/22",
-      "9/23",
-    ],
+    data: [],
   },
   yAxis: {
     type: "value",
@@ -329,14 +229,23 @@ const option1 = ref({
       lineStyle: {
         color: "#193775",
       },
-    },
+    }
+  },
+  tooltip: {
+    trigger: 'axis',
+    axisPointer: {
+      type: 'line',
+      label: {
+        backgroundColor: '#6a7985'
+      }
+    }
   },
   series: [
     {
       type: "line",
       smooth: true,
       label: {
-        show: false,
+        show: false
       },
       lineStyle: {
         color: "#28E6FF",
@@ -354,10 +263,7 @@ const option1 = ref({
           },
         ]),
       },
-      data: [
-        2000, 1160, 2310, 3000, 3100, 3100, 3100, 2000, 1160, 2310,
-        3000, 3100, 3100, 3100,
-      ],
+      data: [],
     },
   ],
 });
@@ -399,7 +305,49 @@ function go() {
 
 // region  机构问题排名
 const activeOrgTab = ref("1");
+const fxsjlist = ref([]);
+const jsdwlist = ref([]);
+const ywzblist = ref([]);
+const wtlxlist = ref([]);
+// endregion
 
+// region  环形图
+// 业务类型占比
+const zfbaPieOption = computed(() => {
+  return {
+    tooltip: {
+      trigger: "item",
+    },
+    series: [
+      {
+        type: "pie",
+        radius: ["40%", "70%"],
+        label: {
+          color: "#fff",
+        },
+        data: ywzblist.value,
+      },
+    ],
+  };
+});
+// 问题类型占比
+const wtlxPieOption = computed(() => {
+  return {
+    tooltip: {
+      trigger: "item",
+    },
+    series: [
+      {
+        type: "pie",
+        radius: ["40%", "70%"],
+        label: {
+          color: "#fff",
+        },
+        data: wtlxlist.value,
+      },
+    ],
+  };
+});
 // endregion
 
 // region  初始化数据
@@ -418,10 +366,16 @@ const time = ref([
 ]);
 
 function getData() {
+
   getAllGobalCount(time.value).then((res) => {
-    console.log(res);
-    console.log(res.overview)
     overview.value = res.overview;
+    fxsjlist.value = res.fxsjlist;
+    jsdwlist.value = res.jsdwlist;
+    ywzblist.value = res.ywzblist;
+  });
+  getGobalRecentlyTrendByMonth(new Date().getFullYear()).then((res) => {
+    proTrend.value.xAxis.data = res.monthList;
+    proTrend.value.series[0].data = res.totalList;
   });
 }
 
@@ -430,6 +384,7 @@ watch(time, () => {
 });
 onMounted(() => {
   getData();
+
 });
 
 const colors = [
diff --git a/src/views/datav/SceneInsp.vue b/src/views/datav/SceneInsp.vue
index d01e23a..0ba0825 100644
--- a/src/views/datav/SceneInsp.vue
+++ b/src/views/datav/SceneInsp.vue
@@ -136,55 +136,56 @@
             </datav-card>
           </el-col>
           <el-col :span="6">
-            <datav-card >
+            <datav-card>
               <datav-tabs v-model="activeTabRight" size="small">
-                <!-- <el-row class="mb-32">
-                  <el-col :span="6">
-                    <div class="descriptions_cell text-center">
-                      <div class="descriptions_content">
-                        42
-                      </div>
-                      <div class="descriptions_label">
-                        问题数
-                      </div>
-                    </div>
-                  </el-col>
-                  <el-col :span="6">
-                    <div class="descriptions_cell text-center">
-                      <div class="descriptions_content">
-                        2
-                      </div>
-                      <div class="descriptions_label">
-                        整改中
-                      </div>
-                    </div>
-                  </el-col>
-                  <el-col :span="6">
-                    <div class="descriptions_cell text-center">
-                      <div class="descriptions_content">
-                        40
-                      </div>
-                      <div class="descriptions_label">
-                        已整改
-                      </div>
-                    </div>
-                  </el-col>
-                  <el-col :span="6">
-                    <div class="descriptions_cell text-center">
-                      <div class="descriptions_content">
-                        95%
-                      </div>
-                      <div class="descriptions_label">
-                        整改率
-                      </div>
-                    </div>
-                  </el-col>
-                </el-row> -->
+
                 <datav-tab-item label="枪支管理" name="1">
                   <datav-tabs
                       v-model="activeMailTabRight"
                       type="bottom-button"
                   >
+                    <el-row class="mb-32">
+                      <el-col :span="6">
+                        <div class="descriptions_cell text-center">
+                          <div class="descriptions_content">
+                            42
+                          </div>
+                          <div class="descriptions_label">
+                            问题数
+                          </div>
+                        </div>
+                      </el-col>
+                      <el-col :span="6">
+                        <div class="descriptions_cell text-center">
+                          <div class="descriptions_content">
+                            2
+                          </div>
+                          <div class="descriptions_label">
+                            整改中
+                          </div>
+                        </div>
+                      </el-col>
+                      <el-col :span="6">
+                        <div class="descriptions_cell text-center">
+                          <div class="descriptions_content">
+                            40
+                          </div>
+                          <div class="descriptions_label">
+                            已整改
+                          </div>
+                        </div>
+                      </el-col>
+                      <el-col :span="6">
+                        <div class="descriptions_cell text-center">
+                          <div class="descriptions_content">
+                            95%
+                          </div>
+                          <div class="descriptions_label">
+                            整改率
+                          </div>
+                        </div>
+                      </el-col>
+                    </el-row>
                     <datav-tab-item label="分县市局" name="1">
                       <el-scrollbar height="300px">
                         <datav-chart-bar-mail
@@ -192,7 +193,6 @@
                             size="large"
                         />
                       </el-scrollbar>
-
                     </datav-tab-item>
                     <datav-tab-item label="局属单位" name="2">
                       <el-scrollbar height="300px">
@@ -307,12 +307,12 @@
                 </datav-tab-item>
               </datav-tabs>
 
-<!--              <datav-chart-bar
-                  title="问题数排名"
-                  sub-title="问题数"
-                  :data="data2"
-                  :max="9700"
-              />-->
+              <!--              <datav-chart-bar
+                                title="问题数排名"
+                                sub-title="问题数"
+                                :data="data2"
+                                :max="9700"
+                            />-->
 
             </datav-card>
             <datav-card title="督察工作动态">