地图样式 信访大屏重构

src/api/screen/mail.ts

@@ -0,0 +1,30 @@
+import request from "../request";
+
+
+
+export function getFirstAndRepeatMail(times) {
+    return request.get({
+        url: `/datav/mailVisits/getFirstAndRepeatMail?beginTime=${times[0]}&endTime=${times[1]}`
+    });
+}
+
+
+
+export function getAllMailCount(times) {
+    return request.get({
+        url: `/datav/mailVisits/getAllMailCount?beginTime=${times[0]}&endTime=${times[1]}`
+    });
+}
+
+
+export function getMailTrend(year) {
+    return request.get({
+        url: `/datav/mailVisits/getMailTrend?year=${year}`
+    });
+}
+
+export function getEntanglementAndMassMail(times) {
+    return request.get({
+        url: `/datav/mailVisits/getEntanglementAndMassMail?beginTime=${times[0]}&endTime=${times[1]}`
+    });
+}

src/api/screen/rightsComfort.ts

@@ -55,11 +55,6 @@ export function getCaseAriseSituationRate(times) {
 }
 
 
-export function test() {
-    return request.get({
-        url: `/datav/rightsComfort/test`
-    });
-}
 
 
 

src/api/screen/sub1.ts

@@ -0,0 +1,7 @@
+import request from "../request";
+
+export function test(departId) {
+    return request.get({
+        url: `/datav/sub1/test?departId=${departId}`
+    });
+}

src/views/datav/Gobal.vue

@@ -174,7 +174,8 @@ const gobalTempMapVoList = ref([
     "caseVerifyPro": 11,
     "mailPro": 11,
     "policePro": 11,
-    "reviewPro": 11
+    "reviewPro": 11,
+    "value":200
   }
 ]);  // 地图临时数据
 
@@ -280,20 +281,18 @@ const option = ref({
     shadowOffsetY: 0, // 设置垂直阴影位移量为6像素
   },
   visualMap: {
-    type: "piecewise",
+    min: 1,
-    bottom: 10,
+    max: 200,
-    pieces: [
+    text: ['最高问题数', '最低问题数'],
-      {min: 0, max: 500, label: "问题数低于500", color: "#4987F6"},
+    left: 'right',
-      {min: 501, max: 1000, label: "问题数介于500-1000", color: "#F6A149"},
-      {min: 1001, label: "问题数高于1000", color: "#D34343"},
-    ],
-    right: 10,
-    realtime: false,
-    orient: "horizontal",
     textStyle: {
-      color: "#fff",
+      color: '#fff',
     },
+    realtime: false,
     calculable: true,
+    inRange: {
+      color: ['#4987F6', '#F6A149', '#D34343']
+    }
   },
   series: [
     {
@@ -453,12 +452,16 @@ function getData() {
       return {
         ...item,
         originalName: item.name, // 添加原始名称
-        name: name, value: item.totalPro,
+        name: name,
+        value: item.totalPro,
       };
     });
+    const maxItem = mappedData.reduce((prev, current) => (prev.value > current.value) ? prev : current);
+    const minItem = mappedData.reduce((prev, current) => (prev.value < current.value) ? prev : current);
     gobalTempMapVoList.value = mappedData;
-    // gobalTempMapVoList.value = res.gobalTempMapVoList;
+    option.value.series[0].data = gobalTempMapVoList;
-    option.value.series[0].data = mappedData;
+    option.value.visualMap.max = maxItem.value;
+    option.value.visualMap.min = minItem.value;
   })
 }
 onMounted(() => {

src/views/datav/MailVisits.vue

@@ -10,7 +10,7 @@
                 <el-col :span="8">
                   <div class="descriptions_cell text-center">
                     <div class="descriptions_content">
-                      {{ overview.firstMail }}
+                      {{ firstAndRepeatOverview.firstMail }}
                     </div>
                     <div class="descriptions_label">
                       初信初访
@@ -20,7 +20,7 @@
                 <el-col :span="8">
                   <div class="descriptions_cell text-center">
                     <div class="descriptions_content">
-                      {{ overview.secondMail }}
+                      {{ firstAndRepeatOverview.repeatMail }}
                     </div>
                     <div class="descriptions_label">
                       重复信访
@@ -30,7 +30,7 @@
                 <el-col :span="8">
                   <div class="descriptions_cell text-center">
                     <div class="descriptions_content">
-                      {{ overview.secondMail }}
+                      {{ firstAndRepeatOverview.leaderMail }}
                     </div>
                     <div class="descriptions_label">
                       领导接访数
@@ -68,7 +68,7 @@
                       <datav-tab-item label="领导接访" name="3">
                         <el-scrollbar height="300px">
                           <datav-chart-bar
-                              :data="fxsjRepeatMailList"
+                              :data="fxsjLeaderViewMailList"
                               :max="11"
                               size="large"
                               :color="colors"
@@ -102,7 +102,7 @@
                       <datav-tab-item label="领导接访" name="3">
                         <el-scrollbar height="300px">
                           <datav-chart-bar
-                              :data="fxsjRepeatMailList"
+                              :data="bwzdLeaderViewMailList"
                               :max="11"
                               size="large"
                               :color="colors"
@@ -115,6 +115,7 @@
               </datav-card>
             </datav-card>
 
+
             <datav-card title="信访问题类型">
               <v-charts
                   style="height: 300px"
@@ -135,13 +136,13 @@
             </div>
             <div class="flex gap-42">
               <datav-statistic
-                  :value="overview.commissionerMail"
+                  :value="overview.manageMail"
                   title="局长信箱"
                   style="width: 20%"
               />
 
               <datav-statistic
-                  :value="overview.total"
+                  :value="overview.totalMail"
                   title="信访总件数"
                   style="width: 20%"
               />
@@ -157,7 +158,7 @@
               />
 
               <datav-statistic
-                  :value="overview.numMail"
+                  :value="overview.numberMail"
                   title="12337信访"
                   style="width: 20%"
               />
@@ -174,32 +175,42 @@
                 <datav-tab-item label="国家信访" name="1">
                   <v-charts
                       style="width: 105%; height: 300px;"
-                      :option="option1"
+                      :option="policeTrend"
                       autoresize
                   />
                 </datav-tab-item>
                 <datav-tab-item label="公安部信访" name="2">
                   <v-charts
                       style="width: 105%; height: 300px; "
-                      :option="option1"
+                      :option="policeTrend"
+                      autoresize
+                  />
+                </datav-tab-item>
+                <datav-tab-item label="局长信箱" name="3">
+                  <v-charts
+                      style="width: 105%; height: 300px; "
+                      :option="manageTrend"
                       autoresize
                   />
                 </datav-tab-item>
                 <datav-tab-item label="12337信访" name="4">
                   <v-charts
                       style="width: 105%; height: 300px; "
-                      :option="option1"
+                      :option="policeTrend"
                       autoresize
                   />
                 </datav-tab-item>
+
               </datav-tabs>
-              <div class="dropdown-container">
+              <div class="gobal-dropdown-container">
-                <el-dropdown @command="handleCommand" placement="top-start">
+                <el-dropdown class="test" @command="handleCommand">
-                  <span class="el-dropdown-link">{{ selectedOption }} 年</span>
+                    <span class="el-dropdown-link my-gobal-yearselect">
+                      {{ selectedYear + " 年" }}
+                    </span>
                   <template #dropdown>
-                    <el-dropdown-menu>
+                    <el-dropdown-menu style="width: 90px">
-                      <el-dropdown-item command="2024">2024年</el-dropdown-item>
+                      <el-dropdown-item v-for="year in years" :key="year" :command="year">{{ year + " 年" }}
-                      <el-dropdown-item command="2023">2023年</el-dropdown-item>
+                      </el-dropdown-item>
                     </el-dropdown-menu>
                   </template>
                 </el-dropdown>
@@ -209,36 +220,114 @@
           </el-col>
 
           <el-col :span="6">
-            <datav-card title="领导接访情况">
+            <datav-card title="缠访集访情况">
+              <el-row class="mb-32">
+                <el-col :span="8">
+                  <div class="descriptions_cell text-center">
+                    <div class="descriptions_content">
+                      {{ mailEntanglementMassOverview.leaderReview }}
+                    </div>
+                    <div class="descriptions_label">
+                      领导督办
+                    </div>
+                  </div>
+                </el-col>
+                <el-col :span="8">
+                  <div class="descriptions_cell text-center">
+                    <div class="descriptions_content">
+                      {{ mailEntanglementMassOverview.entanglement }}
+                    </div>
+                    <div class="descriptions_label">
+                      缠访闹访
+                    </div>
+                  </div>
+                </el-col>
+                <el-col :span="8">
+                  <div class="descriptions_cell text-center">
+                    <div class="descriptions_content">
+                      {{ mailEntanglementMassOverview.mass }}
+                    </div>
+                    <div class="descriptions_label">
+                      群体集访
+                    </div>
+                  </div>
+                </el-col>
+              </el-row>
               <datav-card>
+                <datav-tabs>
+                  <datav-tab-item label="分县市局" name="1">
                     <datav-tabs
-                    v-model="activeTabRight"
                         type="bottom-button"
                     >
-                  <datav-tab-item label="分县市局" name="1">
+                      <datav-tab-item label="领导督办" name="1">
-                    <el-scrollbar height="450px">
+                        <el-scrollbar height="300px">
                           <datav-chart-bar
-                          :data="fxsjLeaderViewMailList"
+                              :data="fxsjFirstMailList"
+                              size="large"
+                              :max="11"
+                              :color="colors"
+                          />
+                        </el-scrollbar>
+                      </datav-tab-item>
+                      <datav-tab-item label="缠访闹访" name="2">
+                        <el-scrollbar height="300px">
+                          <datav-chart-bar
+                              :data="fxsjRepeatMailList"
+                              :max="11"
                               size="large"
-                          :labelWidth="50"
+                              :color="colors"
-                          sub-title="数量"
+                          />
+                        </el-scrollbar>
+                      </datav-tab-item>
+                      <datav-tab-item label="群体集访" name="3">
+                        <el-scrollbar height="300px">
+                          <datav-chart-bar
+                              :data="fxsjRepeatMailList"
+                              :max="11"
+                              size="large"
+                              :color="colors"
                           />
                         </el-scrollbar>
                       </datav-tab-item>
+                    </datav-tabs>
+                  </datav-tab-item>
                   <datav-tab-item label="部委支队" name="2">
-                    <el-scrollbar height="450px">
+                    <datav-tabs
+                        type="bottom-button"
+                    >
+                      <datav-tab-item label="领导督办" name="1">
+                        <el-scrollbar height="300px">
                           <datav-chart-bar
-                          :data="bwzdLeaderViewMailList"
+                              :data="bwzdFirstMailList"
+                              size="large"
+                          />
+                        </el-scrollbar>
+                      </datav-tab-item>
+                      <datav-tab-item label="缠访闹访" name="2">
+                        <el-scrollbar height="300px">
+                          <datav-chart-bar
+                              :data="bwzdRepeatMailList"
                               :max="11"
-                          :labelWidth="50"
                               size="large"
-                          sub-title="数量"
                           />
                         </el-scrollbar>
                       </datav-tab-item>
+                      <datav-tab-item label="群体集访" name="3">
+                        <el-scrollbar height="300px">
+                          <datav-chart-bar
+                              :data="fxsjRepeatMailList"
+                              :max="11"
+                              size="large"
+                              :color="colors"
+                          />
+                        </el-scrollbar>
+                      </datav-tab-item>
+                    </datav-tabs>
+                  </datav-tab-item>
                 </datav-tabs>
               </datav-card>
             </datav-card>
+
             <datav-card title="追责问责情况">
               <v-charts
                   style="height: 300px"
@@ -263,13 +352,124 @@
 import vCharts from "vue-echarts";
 import changshaMap from "@/assets/data/changsha.json";
 import * as echarts from "echarts/core";
-import {getMailVisitsData, getRecentlyMailTrend, getRecentlyMailTrend12337} from "@/api/datav";
 import moment from "moment/moment.js";
+import {getAllMailCount, getEntanglementAndMassMail, getFirstAndRepeatMail, getMailTrend} from "@/api/screen/mail.ts";
+
 
-/**
+//region  所有变量
- * 地图渲染
+let timer;
- */
+const activeTab = ref("1");
+const bwzdActiveTab = ref("1");  // 部委支队初重信tab
+const activeMailTrend = ref("1");   // 信访趋势tab
+const activeMailTab = ref("1");
+const activeTabRight = ref("1");
+const activeMailTabRight = ref("1");
+
+const overview = ref({
+  totalMail: 0,
+  countryMail: 0,
+  policeMail: 0,
+  numberMail: 0,
+  manageMail: 0,
+});  // 总览
+
+const firstAndRepeatOverview = ref({
+  firstMail: 0,
+  repeatMail: 0,
+  leaderMail: 0
+});
+const fxsjFirstMailList = ref([]);  // 分局初信初访
+const fxsjRepeatMailList = ref([]);  // 分局重访
+const fxsjLeaderViewMailList = ref([]);   // 分局领导接访
+const bwzdFirstMailList = ref([]);   // 部委初信
+const bwzdRepeatMailList = ref([]);   // 部委重访
+const bwzdLeaderViewMailList = ref([]);   // 部委领导接访
+
+
+const mailEntanglementMassOverview = ref({
+  entanglement: 0,
+  mass: 0,
+  leaderReview: 0,
+})
+const fxsjLeaderReviewMailList = ref([]);   // 分局领导督察
+const fxsjEntanglementMailList = ref([]);  // 分局缠闹
+const fxsjMassMailList = ref([]);   // 分局集访
+
+const bwzdLeaderReviewMailList = ref([]);   // 分局领导督察
+const bwzdEntanglementMailList = ref([]);  // 部委缠闹
+const bwzdMassMailList = ref([]);  // 部委集访
+
+const time = ref([
+  moment().startOf("year").format("YYYY-MM-DD"),
+  moment().format("YYYY-MM-DD"),
+]);
+const currentYear = new Date().getFullYear();
+const years = ref([currentYear.toString(), (currentYear - 1).toString(), (currentYear - 2).toString()]); // 年份列表
+const selectedYear = ref(currentYear); // 当前选中的年份
+//endregion
+
+// region 所有函数
+const getFirstAndRepeatMailRank = async (timeValue = time.value) => {
+  const res = await getFirstAndRepeatMail(timeValue)
+  firstAndRepeatOverview.value = res.firstAndRepeatOverview;
+  fxsjFirstMailList.value = res.fxsjFirstRankList;
+  fxsjRepeatMailList.value = res.fxsjRepeatRankList;
+  fxsjLeaderViewMailList.value = res.fxsjLeaderViewRankList;
+
+  bwzdFirstMailList.value = res.bwzdFirstRankList;
+  bwzdRepeatMailList.value = res.bwzdRepeatRankList;
+  bwzdLeaderViewMailList.value = -res.bwzdLeaderViewRankList;
+
+}
+const getOverview = async (timeValue = time.value) => {
+  const res = await getAllMailCount(timeValue)
+  overview.value = res.overview;
+}
+const getTrend = async (year = selectedYear.value) => {
+  const res = await getMailTrend(year);
+  const policeList = res.policeList;
+  const manageList = res.manageList;
+  const numberList = res.numberList;
+  const countryList = res.countryList;
+  const policecategories = policeList.map(item => item.name);
+  const policevalues = policeList.map(item => item.value);
+  const managecategories = manageList.map(item => item.name);
+  const managevalues = manageList.map(item => item.value);
+  const numbercategories = numberList.map(item => item.name);
+  const numbervalues = numberList.map(item => item.value);
+  const countrycategories = countryList.map(item => item.name);
+  const countryvalues = countryList.map(item => item.value);
+  // 更新图表数据
+  policeTrend.value.xAxis.data = policecategories;
+  policeTrend.value.series[0].data = policevalues;
+  manageTrend.value.xAxis.data = managecategories;
+  manageTrend.value.series[0].data = managevalues;
+  numberTrend.value.xAxis.data = numbercategories;
+  numberTrend.value.series[0].data = numbervalues;
+  countryTrend.value.xAxis.data = countrycategories;
+  countryTrend.value.series[0].data = countryvalues;
+}
+const getEntangleMassRank = async (timeValue = time.value) => {
+  const res = await getEntanglementAndMassMail(timeValue)
+  mailEntanglementMassOverview.value = res.mailEntanglementMassOverview;
+  fxsjEntanglementMailList.value = res.fxsjEntanglementList;
+  fxsjMassMailList.value = res.fxsjMassList;
+  fxsjLeaderReviewMailList.value = res.fxsjLeaderReviewList;
+
+  bwzdLeaderReviewMailList.value = res.bwzdLeaderReviewList;
+  bwzdEntanglementMailList.value = res.bwzdEntanglementList;
+  bwzdMassMailList.value = res.bwzdMassList;
+}
+const getData = async () => {
+  await getFirstAndRepeatMailRank();
+  await getOverview();
+  await getTrend();
+  await getEntangleMassRank();
+}
+// endregion
 
+
+// region 所有图
 echarts.registerMap("changsha", changshaMap);
 let gobalTempMapVoList = [
   {
@@ -417,12 +617,208 @@ const option = ref({
     }
   ],
 })
-
+const policeTrend = ref({
-const option1 = ref({
+  grid: {
+    left: '5%', // 图表距离容器左边的距离
+    right: '2%', // 图表距离容器右边的距离
+    top: '10%', // 图表距离容器上边的距离
+    bottom: '20%', // 图表距离容器下边的距离
+    containLabel: false // 是否包含坐标轴的标签
+  },
   xAxis: {
     type: "category",
-    boundaryGap: false,
     data: [],
+    boundaryGap: true,
+    axisTick: {
+      // 去掉X轴刻度线
+      show: false
+    },
+  },
+  yAxis: {
+    type: "value",
+    splitLine: {
+      show: true,
+      lineStyle: {
+        color: "#193775",
+      },
+    }
+  },
+  tooltip: {
+    trigger: 'axis',
+    axisPointer: {
+      type: 'line',
+      label: {
+        backgroundColor: '#6a7985'
+      }
+    }
+  },
+  series: [
+    {
+      type: "line",
+      smooth: true,
+      label: {
+        show: false
+      },
+      lineStyle: {
+        color: "#28E6FF",
+        width: 4,
+      },
+      areaStyle: {
+        color: new echarts.graphic.LinearGradient(0, 0, 0, 1, [
+          {
+            offset: 0,
+            color: "rgba(40,230,255,0.47)", // 渐变起始颜色
+          },
+          {
+            offset: 1,
+            color: "rgba(40,230,255,0)", // 渐变结束颜色
+          },
+        ]),
+      },
+      data: [],
+    },
+  ],
+});
+const manageTrend = ref({
+  grid: {
+    left: '5%', // 图表距离容器左边的距离
+    right: '2%', // 图表距离容器右边的距离
+    top: '10%', // 图表距离容器上边的距离
+    bottom: '20%', // 图表距离容器下边的距离
+    containLabel: false // 是否包含坐标轴的标签
+  },
+  xAxis: {
+    type: "category",
+    data: [],
+    boundaryGap: true,
+    axisTick: {
+      // 去掉X轴刻度线
+      show: false
+    },
+  },
+  yAxis: {
+    type: "value",
+    splitLine: {
+      show: true,
+      lineStyle: {
+        color: "#193775",
+      },
+    }
+  },
+  tooltip: {
+    trigger: 'axis',
+    axisPointer: {
+      type: 'line',
+      label: {
+        backgroundColor: '#6a7985'
+      }
+    }
+  },
+  series: [
+    {
+      type: "line",
+      smooth: true,
+      label: {
+        show: false
+      },
+      lineStyle: {
+        color: "#28E6FF",
+        width: 4,
+      },
+      areaStyle: {
+        color: new echarts.graphic.LinearGradient(0, 0, 0, 1, [
+          {
+            offset: 0,
+            color: "rgba(40,230,255,0.47)", // 渐变起始颜色
+          },
+          {
+            offset: 1,
+            color: "rgba(40,230,255,0)", // 渐变结束颜色
+          },
+        ]),
+      },
+      data: [],
+    },
+  ],
+});
+const numberTrend = ref({
+  grid: {
+    left: '5%', // 图表距离容器左边的距离
+    right: '2%', // 图表距离容器右边的距离
+    top: '10%', // 图表距离容器上边的距离
+    bottom: '20%', // 图表距离容器下边的距离
+    containLabel: false // 是否包含坐标轴的标签
+  },
+  xAxis: {
+    type: "category",
+    data: [],
+    boundaryGap: true,
+    axisTick: {
+      // 去掉X轴刻度线
+      show: false
+    },
+  },
+  yAxis: {
+    type: "value",
+    splitLine: {
+      show: true,
+      lineStyle: {
+        color: "#193775",
+      },
+    }
+  },
+  tooltip: {
+    trigger: 'axis',
+    axisPointer: {
+      type: 'line',
+      label: {
+        backgroundColor: '#6a7985'
+      }
+    }
+  },
+  series: [
+    {
+      type: "line",
+      smooth: true,
+      label: {
+        show: false
+      },
+      lineStyle: {
+        color: "#28E6FF",
+        width: 4,
+      },
+      areaStyle: {
+        color: new echarts.graphic.LinearGradient(0, 0, 0, 1, [
+          {
+            offset: 0,
+            color: "rgba(40,230,255,0.47)", // 渐变起始颜色
+          },
+          {
+            offset: 1,
+            color: "rgba(40,230,255,0)", // 渐变结束颜色
+          },
+        ]),
+      },
+      data: [],
+    },
+  ],
+});
+const countryTrend = ref({
+  grid: {
+    left: '5%', // 图表距离容器左边的距离
+    right: '2%', // 图表距离容器右边的距离
+    top: '10%', // 图表距离容器上边的距离
+    bottom: '20%', // 图表距离容器下边的距离
+    containLabel: false // 是否包含坐标轴的标签
+  },
+  xAxis: {
+    type: "category",
+    data: [],
+    boundaryGap: true,
+    axisTick: {
+      // 去掉X轴刻度线
+      show: false
+    },
   },
   yAxis: {
     type: "value",
@@ -514,163 +910,25 @@ const option3 = {
     },
   ],
 };
-const activeTab = ref("1");
+// endregion
-const bwzdActiveTab = ref("1");  // 部委支队初重信tab
-const activeMailTrend = ref("1");   // 信访趋势tab
-const activeMailTab = ref("1");
-const activeTabRight = ref("1");
-const activeMailTabRight = ref("1");
-// 总数对象
-const overview = ref({
-  total: 0,
-  countryMail: 0,
-  policeMail: 0,
-  commissionerMail: 0,
-  numMail: 0,
-  firstMail: 0,
-  secondMail: 0,
-  leaderReceiveMail: 0,
-  leaderViewMail: 0,
-  tangleMail: 0,
-  massMail: 0,
-});
-// 分局初重领信
-const fxsjFirstMailList = ref([]);
-const fxsjRepeatMailList = ref([]);
-const fxsjLeaderViewMailList = ref([]);
-// 部委初重信
-const bwzdFirstMailList = ref([]);
-const bwzdRepeatMailList = ref([]);
-const bwzdLeaderViewMailList = ref([]);
-// 分局缠闹
-const fxsjEntanglementMailList = ref([]);
-const fxsjMassMailList = ref([]);
-// 部委缠闹
-const bwzdEntanglementMailList = ref([]);
-const bwzdMassMailList = ref([]);
-const time = ref([
-  moment().startOf("year").format("YYYY-MM-DD"),
-  moment().format("YYYY-MM-DD"),
-]);
 
 
-const temp1 = [{
+const handleCommand = (year) => {
-  label: '张三',
+  selectedYear.value = year;
-  value: '1'
+  getTrend()
-}]
-
-const temp2 = [{
-  label: '李四',
-  value: '1'
-}]
-
-
-/**
- * 信访趋势
- * @type {Ref<UnwrapRef<string>, UnwrapRef<string> | string>}
- */
-const selectedOption = ref('2024');
-const handleCommand = async (command) => {
-  selectedOption.value = `${command}`;
-  if (activeMailTrend.value === "1" || activeMailTrend.value === "2") {
-    const recentlyMailTrend = await getRecentlyMailTrend({
-      sourcesCode: activeMailTab.value,
-      year: command,
-      startTime: time.value[0],
-      endTime: time.value[1]
-    });   // 获取最近信访趋势
-    // 更新图表的 xAxis 和 series 数据
-    option1.value.xAxis.data = recentlyMailTrend.monthList;
-    option1.value.series[0].data = recentlyMailTrend.totalList;
-  }
-
-  if (activeMailTrend.value === "3") {
-  }
-  if (activeMailTrend.value === "4") {
-    const recentlyMailTrend = await getRecentlyMailTrend12337({
-      year: selectedOption.value,
-      startTime: time.value[0],
-      endTime: time.value[1]
-    })
-    option1.value.xAxis.data = recentlyMailTrend.monthList;
-    option1.value.series[0].data = recentlyMailTrend.totalList;
-  }
 };
 // 监听信访趋势tab切换
-watch(activeMailTrend, async () => {
-  if (activeMailTrend.value <= 2) {
-    const recentlyMailTrend = await getRecentlyMailTrend({
-      sourcesCode: activeMailTrend.value,
-      year: selectedOption.value,
-      startTime: time.value[0],
-      endTime: time.value[1]
-    });
-    option1.value.xAxis.data = recentlyMailTrend.monthList;
-    option1.value.series[0].data = recentlyMailTrend.totalList;
-  }
-  if (activeMailTrend.value === "3") {
-    option1.value.xAxis.data = null;
-    option1.value.series[0].data = null;
-  }
-  if (activeMailTrend.value === "4") {
-    const recentlyMailTrend = await getRecentlyMailTrend12337({
-      year: selectedOption.value,
-      startTime: time.value[0],
-      endTime: time.value[1]
-    })
-    option1.value.xAxis.data = recentlyMailTrend.monthList;
-    option1.value.series[0].data = recentlyMailTrend.totalList;
-  }
-})
-
-
-/**
- * 初始化
- */
-let timer;
-const currentYear = new Date().getFullYear();
-
-function initRecentlyMailTrend() {
-  getRecentlyMailTrend({
-    sourcesCode: "1",
-    year: currentYear,
-    startTime: time.value[0],
-    endTime: time.value[1]
-  }).then((data) => {
-    // 更新图表的 xAxis 和 series 数据
-    option1.value.xAxis.data = data.monthList;
-    option1.value.series[0].data = data.totalList;
-  });
-}
-
 watch(time, () => {
   getData();
-  // initRecentlyMailTrend()
 })
 onMounted(() => {
   getData();
-  initRecentlyMailTrend();
   // timer = setInterval(() => {
   //   activeMailTab.value = (parseInt(activeMailTab.value) % 3 + 1).toString();
   //   console.log("Active Tab: ", activeMailTab.value);
   // }, 3000); // 每3秒切换一次
 });
 
-function getData() {
-  getMailVisitsData(time.value).then((data) => {
-    overview.value = data.overview;
-    fxsjFirstMailList.value = data.fxsjFirstMailList;
-    fxsjRepeatMailList.value = data.fxsjRepeatMailList;
-    fxsjLeaderViewMailList.value = data.fxsjLeaderViewMailList;
-    bwzdFirstMailList.value = data.bwzdFirstMailList;
-    bwzdRepeatMailList.value = data.bwzdRepeatMailList;
-    bwzdLeaderViewMailList.value = data.bwzdLeaderViewMailList;
-    fxsjEntanglementMailList.value = data.fxsjEntanglementMailList
-    fxsjMassMailList.value = data.fxsjMassMailList
-    bwzdEntanglementMailList.value = data.bwzdEntanglementMailList
-    bwzdMassMailList.value = data.bwzdMassMailList
-  });
-}
 
 const colors = [
   {
@@ -764,4 +1022,25 @@ const colors = [
 }
 
 
+.test {
+  width: 95px;
+  height: 25px;
+  background: #1C3472;
+}
+
+.gobal-dropdown-container {
+  position: absolute;
+  right: 20px;
+  top: 15px;
+}
+
+.my-gobal-yearselect {
+  font-size: 14px;
+  padding-top: 6px;
+  padding-left: 20px;
+  width: 90px;
+  color: #fff;
+}
+
+
 </style>

src/views/datav/RightsComfort.vue

@@ -219,7 +219,7 @@ import {
   getALlComfortCount,
   getPunishmentSituation,
   getComfortSituation,
-  getRightsAndComfortRank, getPoliceHurtSituationAndHurtType, getCaseAriseSituationRate,test
+  getRightsAndComfortRank, getPoliceHurtSituationAndHurtType, getCaseAriseSituationRate
 } from "@/api/screen/rightsComfort.ts";
 
 // const temp = ref({
@@ -575,7 +575,6 @@ watch(time, () => {
 })
 onMounted(() => {
   getData();
-  test()
 });
 
 

src/views/datav/SceneInsp.vue

@@ -886,7 +886,6 @@ const jsdwCheckBeerOverview = ref({
 const fxsjCheckBeerRankList = ref([])  //  工作日测酒排行分县市局
 const jsdwCheckBeerRankList = ref([])  //  工作日测酒排行局属单位
 
-
 const messages = ref([
     {
   type: '',
@@ -913,11 +912,13 @@ const messages = ref([
   date: '2024-06-06 09:04'
 }
 ]);
-
+const currentYear = new Date().getFullYear();
+const years = ref([currentYear.toString(), (currentYear - 1).toString(), (currentYear - 2).toString()]); // 年份列表
+const selectedYear = ref('2024'); // 当前选中的年份
 // endregion
 
 
-// region 问题类型占比环形图
+// region 所有图表
 const wtlxPieOption = computed(() => {
   return {
     tooltip: {
@@ -935,12 +936,8 @@ const wtlxPieOption = computed(() => {
     ],
   };
 });
-// endregion
-
-// region 地图相关
-echarts.registerMap("changsha", changshaMap);
-let superviseTempMapVoList = ref([]);
 echarts.registerMap("changsha", changshaMap);
+const superviseTempMapVoList = ref([]);
 const option = ref({
   geo: {
     map: "changsha",
@@ -984,24 +981,18 @@ const option = ref({
 
   },
   visualMap: {
-
+    min: 1,
-    type: "piecewise",
+    max: 200,
-    bottom: 10,
+    text: ['最高问题数', '最低问题数'],
-    pieces: [
+    left: 'right',
-      {gte: 0, lte: 500, label: "问题数低于500"},
-      {gte: 501, lte: 1000, label: "问题数介于500-1000"},
-      {gte: 1000, label: "问题数高于1000"},
-    ],
-    right: 10,
-    realtime: false,
-    orient: "horizontal",
     textStyle: {
-      color: "#fff",
+      color: '#fff',
     },
+    realtime: false,
     calculable: true,
     inRange: {
-      color: ["#4987F6", "#F6A149", "#D34343",],
+      color: ['#4987F6', '#F6A149', '#D34343']
-    },
+    }
   },
   series: [
     {
@@ -1028,10 +1019,6 @@ const option = ref({
     }
   ],
 })
-// endregion
-
-
-// region 问题趋势线状图
 const proTrend = ref({
   grid: {
     left: '5%', // 图表距离容器左边的距离
@@ -1094,9 +1081,11 @@ const proTrend = ref({
     },
   ],
 });
-const currentYear = new Date().getFullYear();
+// endregion
-const years = ref([currentYear.toString(), (currentYear - 1).toString(), (currentYear - 2).toString()]); // 年份列表
+
-const selectedYear = ref('2024'); // 当前选中的年份
+
+
+
 const handleCommand = (year) => {
   selectedYear.value = year; // 更新当前选中的年份
   getSupervisionTrend(year).then(res => {
@@ -1108,7 +1097,7 @@ const handleCommand = (year) => {
     proTrend.value.series[0].data = values;
   });
 };
-// endregion
+
 
 
 // region  初始化数据
@@ -1136,7 +1125,6 @@ function getData() {
     jsdwRankOverview.value = res.jsdwRankOverview;
     fxsjChangedRankList.value = res.fxsjChangedRankList;
     jsdwChangedRankList.value = res.jsdwChangedRankList;
-
     // rankOverview.value = res.rankOverview;
     // data1.value = res.changedRankList;
   });
@@ -1196,8 +1184,12 @@ function getData() {
         value: item.totalPro,
       };
     });
+    const maxItem = mappedData.reduce((prev, current) => (prev.value > current.value) ? prev : current);
+    const minItem = mappedData.reduce((prev, current) => (prev.value < current.value) ? prev : current);
     superviseTempMapVoList.value = mappedData;
     option.value.series[0].data = mappedData;
+    option.value.visualMap.max = maxItem.value;
+    option.value.visualMap.min = minItem.value;
   })
 
   getProblemTypeRate(time.value).then((res) => {

src/views/datav/Sub1.vue

@@ -546,7 +546,9 @@ const time = ref([
   moment().format("YYYY-MM-DD"),
 ]);   // 时间范围
 const router = useRouter()
+const route = useRoute();
 import geoJson from "@/assets/data/浏阳市.json";
+import {test} from "@/api/screen/sub1.ts";
 
 echarts.registerMap("浏阳市", geoJson);
 const option = ref({
@@ -634,7 +636,6 @@ const option = ref({
     }
   ],
 })
-
 const option1 = ref({
   xAxis: {
     type: "category",
@@ -686,6 +687,18 @@ const option1 = ref({
     },
   ],
 });
+const currentDepartId = route.query.departId;
+const beginTest = async (departId) => {
+  const res = await test(departId);
+  console.log(res)
+}
+
+
+onMounted(() => {
+  // currentDepartId.value = route.query.departId;
+  beginTest(currentDepartId);
+})
+console.log(currentDepartId)
 
 function go() {
   router.push('/datav/sub2')

src/views/datav/VideoInsp.vue

@@ -277,8 +277,13 @@ const getMap = async (timeValue) => {
       value: item.discoverProblem,
     };
   });
+  const maxItem = mappedData.reduce((prev, current) => (prev.value > current.value) ? prev : current);
+  const minItem = mappedData.reduce((prev, current) => (prev.value < current.value) ? prev : current);
   mapIconList.value = mappedData
-  console.log(mapIconList.value)
+  option.value.series[0].data = mapIconList
+  option.value.visualMap.max = maxItem.value;
+  option.value.visualMap.min = minItem.value;
+  // console.log(mapIconList.value)
 }
 
 
@@ -427,23 +432,18 @@ const option = ref({
 
   },
   visualMap: {
-    type: "piecewise",
+    min: 1,
-    bottom: 10,
+    max: 200,
-    pieces: [
+    text: ['最高问题数', '最低问题数'],
-      {gte: 0, lte: 500, label: "问题数低于500"},
+    left: 'right',
-      {gte: 501, lte: 1000, label: "问题数介于500-1000"},
-      {gte: 1001, label: "问题数高于1000"},
-    ],
-    right: 10,
-    realtime: false,
-    orient: "horizontal",
     textStyle: {
-      color: "#fff",
+      color: '#fff',
     },
+    realtime: false,
     calculable: true,
     inRange: {
-      color: ["#4987F6", "#F6A149", "#D34343",],
+      color: ['#4987F6', '#F6A149', '#D34343']
-    },
+    }
   },
   series: [
     {