src/api/screen/mail.ts

@@ -42,10 +42,9 @@ export function getEntanglementAndMassMail(body) {
 
 
 //追责问责情况
-export function  getResultCount(body){
+export function  getResultCount(times){
-    return request.post({
+    return request.get({
-        url:`/datav/mailVisits/getResultCount`,
+        url:`/datav/mailVisits/getResultCount?beginTime=${times[0]}&endTime=${times[1]}`
-        body
     })
 
 }

src/api/screen/subScreen/subOneCaseVerif.ts

@@ -40,7 +40,7 @@ export function getSubOneCaseVerificationTrend(departId, year) {
     });
 }
 
-
+//  @Operation(summary = "案件来源占比 & 问责处理情况")
 export function getSubOneCaseSourceRateAndDealSituation(body) {
     return request.post({
         url: `/datav/sub1/caseVerif/getSubOneCaseSourceRateAndDealSituation`,
@@ -52,6 +52,6 @@ export function getSubOneCaseSourceRateAndDealSituation(body) {
 
 export function getSubOneConfinementAndPause(departId, times) {
     return request.get({
-        url: `/datav/sub1/caseVerif/getSubOneConfinementAndPause?departId=${departId}&beginTime=${times[0]}&endTime=${times[1]}`
+        url: `/datav/sub1/caseVerif/getSubOneCaseSourceRateAndDealSituation?departId=${departId}&beginTime=${times[0]}&endTime=${times[1]}`
     });
 }

src/api/screen/subScreen/subOneSupervisionNotify.ts

@@ -1,13 +1,14 @@
 import request from "@/api/request";
 
-// 现场监督卡片
+
-export function getSubOneChangedRank(body) {
+//监督管理-整改率排名
-    return request.post({
+export function getSubOneChangedRank(departId, times) {
-        url: `/datav/sub1/supervisonNotify/getSubOneChangedRank`,
+    return request.get({
-        body
+        url: `/datav/sub1/supervisonNotify/getSubOneChangedRank?departId=${departId}&beginTime=${times[0]}&endTime=${times[1]}`
     });
 }
 
+
 export function getSubOneProblemTypeRate(departId, times) {
     return request.get({
         url: `/datav/sub1/supervisonNotify/getSubOneProblemTypeRate?departId=${departId}&beginTime=${times[0]}&endTime=${times[1]}`
@@ -19,29 +20,22 @@ export function getSubOneSupervisionTrend(departId, year) {
         url: `/datav/sub1/supervisonNotify/getSubOneSupervisionTrend?departId=${departId}&year=${year}`
     });
 }
-
+//监督管理-中央数据
-// 中央数据
+export function getSubOneSupervisionNotifyCount(departId, times) {
-export function getSubOneSupervisionNotifyCount(body) {
+    return request.get({
-    return request.post({
+        url: `/datav/sub1/supervisonNotify/getSubOneSupervisionNotifyCount?departId=${departId}&beginTime=${times[0]}&endTime=${times[1]}`
-        url: `/datav/sub1/supervisonNotify/getSubOneSupervisionNotifyCount`,
-        body
     });
 }
 
-export function getSubOneSupervisionNotifyMap(body) {
+export function getSubOneSupervisionMap(departId, times) {
-    return request.post({
+    return request.get({
-        url: `/datav/sub1/supervisonNotify/getSubOneSupervisionNotifyMap`,
+        url: `/datav/sub1/supervisonNotify/getSubOneSupervisionMap?departId=${departId}&beginTime=${times[0]}&endTime=${times[1]}`
-        body
     });
 }
 
-
+export function getSubOneYellowBetDrug(departId, times,type) {
-
+    return request.get({
-
+        url: `/datav/sub1/supervisonNotify/getSubOneYellowBetDrug?departId=${departId}&beginTime=${times[0]}&endTime=${times[1]}&type=${type}`
-export function getSubOneYellowBetDrug(body) {
-    return request.post({
-        url: `/datav/sub1/supervisonNotify/getSubOneYellowBetDrug`,
-        body
     });
 }
 
@@ -50,3 +44,6 @@ export function getSubOneWorkDynamics(departId, times) {
         url: `/datav/sub1/supervisonNotify/getSubOneWorkDynamics?departId=${departId}&beginTime=${times[0]}&endTime=${times[1]}`
     });
 }
+
+// export
+

src/views/datav/MailVisits.vue

@@ -807,13 +807,13 @@ const option3 =ref( {
 
 
 //获取追责问责情况
-const getResultCountDataFun = async ()=>{
+const getResultCountDataFun = async (timeValue = time.value)=>{
-  const body = {
+  const res = await  getResultCount(timeValue);
-    beginTime: time.value[0],
+  let resultCountArray = []
-    endTime: time.value[1],
+  Object.keys(res).forEach(s=>{
-  }
+    resultCountArray.push({name:s,value:res[s]})
-  const res = await  getResultCount(body);
+  })
-  option3.value.series[0].data=res.resultCountArray;
+  option3.value.series[0].data=resultCountArray;
 }
 
 // region 所有函数

src/views/datav/subonedatav/SubOneCaseVerif.vue

@@ -548,7 +548,6 @@ const getSubOneCaseProblemPropertyData = async (departId, timeValue) => {
   const res = await getSubOneCaseProblemProperty(departId, timeValue);
   zfbaPieOption.value.series[0].data = res.zfbaPieList;
   fwglPieOption.value.series[0].data = res.fwglPieList;
-  jgjjPieOption.value.series[0].data = res.fwglPieList;
 }
 const getSubOneAllCaseVerificationCountData = async () => {
 

src/views/datav/subonedatav/SubOneSceneInsp.vue

@@ -27,7 +27,7 @@
                     <el-col :span="6">
                       <div class="descriptions_cell text-center">
                         <div class="descriptions_content">
-                          {{ leftOverview.processingNumber }}
+                          {{ leftOverview.changing }}
                         </div>
                         <div class="descriptions_label">
                           办理中
@@ -37,7 +37,7 @@
                     <el-col :span="6">
                       <div class="descriptions_cell text-center">
                         <div class="descriptions_content">
-                          {{ leftOverview.completedNumber }}
+                          {{ leftOverview.changed }}
                         </div>
                         <div class="descriptions_label">
                           已办结
@@ -47,7 +47,7 @@
                     <el-col :span="6">
                       <div class="descriptions_cell text-center">
                         <div class="descriptions_content">
-                          {{ leftOverview.completedRate }}%
+                          {{ leftOverview.correctionRate }}%
                         </div>
                         <div class="descriptions_label">
                           办结率
@@ -58,11 +58,10 @@
                   <el-scrollbar height="350px">
                     <datav-chart-bar
                         :data="fxsjChangedRankList"
-                        size="large"
+                        size="small"
                         title="办结率排名"
                         sub-title="已办结/问题数"
                         unit="%"
-                        :isgroupby="true"
                         :label-width="110"
                         :color="dayTimeColors"
                     />
@@ -83,7 +82,7 @@
                     <el-col :span="6">
                       <div class="descriptions_cell text-center">
                         <div class="descriptions_content">
-                          {{ leftOverview.processingNumber }}
+                          {{ leftOverview.changing }}
                         </div>
                         <div class="descriptions_label">
                           办理中
@@ -93,7 +92,7 @@
                     <el-col :span="6">
                       <div class="descriptions_cell text-center">
                         <div class="descriptions_content">
-                          {{ leftOverview.completedNumber }}
+                          {{ leftOverview.changed }}
                         </div>
                         <div class="descriptions_label">
                           已办结
@@ -103,7 +102,7 @@
                     <el-col :span="6">
                       <div class="descriptions_cell text-center">
                         <div class="descriptions_content">
-                          {{ leftOverview.completedRate }}%
+                          {{ leftOverview.correctionRate }}%
                         </div>
                         <div class="descriptions_label">
                           办结率
@@ -118,7 +117,6 @@
                         title="办结率排名"
                         sub-title="已办结/问题数"
                         unit="%"
-                        :isgroupby="true"
                         :label-width="110"
                         :color="dayTimeColors"
                     />
@@ -218,7 +216,7 @@
                           <el-col :span="6">
                             <div class="descriptions_cell text-center">
                               <div class="descriptions_content">
-                                {{ rightOverview.proTotal }}
+                                {{ fxsjYellowBetOverview.proTotal }}
                               </div>
                               <div class="descriptions_label">
                                 问题数
@@ -228,7 +226,7 @@
                           <el-col :span="6">
                             <div class="descriptions_cell text-center">
                               <div class="descriptions_content">
-                                {{ rightOverview.processingNumber }}
+                                {{ fxsjYellowBetOverview.changing }}
                               </div>
                               <div class="descriptions_label">
                                 办理中
@@ -238,7 +236,7 @@
                           <el-col :span="6">
                             <div class="descriptions_cell text-center">
                               <div class="descriptions_content">
-                                {{ rightOverview.completedNumber }}
+                                {{ fxsjYellowBetOverview.changed }}
                               </div>
                               <div class="descriptions_label">
                                 已办结
@@ -248,7 +246,7 @@
                           <el-col :span="6">
                             <div class="descriptions_cell text-center">
                               <div class="descriptions_content">
-                                {{ rightOverview.completedRate }}%
+                                {{ fxsjYellowBetOverview.correctionRate }}%
                               </div>
                               <div class="descriptions_label">
                                 办结率
@@ -272,7 +270,7 @@
                           <el-col :span="6">
                             <div class="descriptions_cell text-center">
                               <div class="descriptions_content">
-                                {{ rightOverview.proTotal }}
+                                {{ jsdwYellowBetOverview.proTotal }}
                               </div>
                               <div class="descriptions_label">
                                 问题数
@@ -282,7 +280,7 @@
                           <el-col :span="6">
                             <div class="descriptions_cell text-center">
                               <div class="descriptions_content">
-                                {{ rightOverview.processingNumber }}
+                                {{ jsdwYellowBetOverview.changing }}
                               </div>
                               <div class="descriptions_label">
                                 办理中
@@ -292,7 +290,7 @@
                           <el-col :span="6">
                             <div class="descriptions_cell text-center">
                               <div class="descriptions_content">
-                                {{ rightOverview.completedNumber }}
+                                {{ jsdwYellowBetOverview.changed }}
                               </div>
                               <div class="descriptions_label">
                                 已办结
@@ -302,7 +300,7 @@
                           <el-col :span="6">
                             <div class="descriptions_cell text-center">
                               <div class="descriptions_content">
-                                {{ rightOverview.completedRate }}%
+                                {{ jsdwYellowBetOverview.correctionRate }}%
                               </div>
                               <div class="descriptions_label">
                                 办结率
@@ -512,7 +510,7 @@ import moment from "moment";
 import {getSubOneStreetMap} from "@/api/screen/subScreen/subOneGlobal.ts";
 import {
   getSubOneChangedRank,
-  getSubOneProblemTypeRate, getSubOneSupervisionNotifyMap, getSubOneSupervisionNotifyCount,
+  getSubOneProblemTypeRate, getSubOneSupervisionMap, getSubOneSupervisionNotifyCount,
   getSubOneSupervisionTrend, getSubOneWorkDynamics, getSubOneYellowBetDrug
 } from "@/api/screen/subScreen/subOneSupervisionNotify.ts";
 import {workDynamicColorMapping} from "@/enums/workDynamicColorMapping.js";
@@ -592,14 +590,8 @@ let subOneSceneWorkDynamicsIntervalId;
 const tempDepartId = ref(0);  // 临时部门id
 const showDialog = ref(false);  // 负面信息弹窗显示
 const rightOverview =ref({})
-const getYellowBetDrugData = async () => {
+const getYellowBetDrugData = async (departId,times) => {
-  const body = {
+  const res = await getSubOneYellowBetDrug(departId, times,subOneZxdcProRankTab.value)
-    beginTime: time.value[0],
-    endTime: time.value[1],
-    departId: currentDepartId,
-    specialSupervision: subOneZxdcProRankTab.value
-  }
-  const res = await getSubOneYellowBetDrug(body)
   rightOverview.value = res.overview;
   fxsjYellowBetOverview.value = res.fxsjYellowBetOverview
   jsdwYellowBetOverview.value = res.jsdwYellowBetOverview
@@ -608,7 +600,7 @@ const getYellowBetDrugData = async () => {
 };
 
 watch(subOneZxdcProRankTab, () => {
-  getYellowBetDrugData()
+  getYellowBetDrugData(currentDepartId, time.value)
 })
 
 
@@ -816,29 +808,23 @@ const getMapJSON = async (departId = currentDepartId) => {
   echarts.registerMap("changsha", res);
   subOneSceneInspMapChart.value.chart.setOption(option.value);
 }
-const getSubOneChangedRankData = async () => {
+const getSubOneChangedRankData = async (departId, times) => {
-  const res = await getSubOneChangedRank({
+  const res = await getSubOneChangedRank(departId, times)
-    departId: currentDepartId,
-    beginTime: time.value[0],
-    endTime: time.value[1]
-  })
   leftOverview.value =res.overview;
+  fxsjRankOverview.value = res.fxsjRankOverview;
+  jsdwRankOverview.value = res.jsdwRankOverview;
   fxsjChangedRankList.value = res.fxsjChangedRankList;
   jsdwChangedRankList.value = res.jsdwChangedRankList;
   console.log(res);
 
 }
-const getSubOneProblemTypeRateData = async () => {
+const getSubOneProblemTypeRateData = async (departId, times) => {
-  const res = await getSubOneProblemTypeRate(currentDepartId, time.value)
+  const res = await getSubOneProblemTypeRate(departId, times)
   // wtlxList.value = circularChart;
   wtlxList.value = res.wtlxList
 }
-const getSubOneSupervisionNotifyCountData = async () => {
+const getSubOneSupervisionNotifyCountData = async (departId, times) => {
-  const res = await getSubOneSupervisionNotifyCount({
+  const res = await getSubOneSupervisionNotifyCount(departId, times)
-    departId: currentDepartId,
-    beginTime: time.value[0],
-    endTime: time.value[1]
-  })
   Object.assign(overview.value, {
     correctionRate: Number(res.overview.completedRate),
     supervisionNotifyPreTotal: Number(res.overview.personNumber),
@@ -849,12 +835,8 @@ const getSubOneSupervisionNotifyCountData = async () => {
     reportNumber: Number(res.overview.reportNumber)
   });
 }
-const getSubOneSupervisionMapData = async () => {
+const getSubOneSupervisionMapData = async (departId, times) => {
-  const res = await getSubOneSupervisionNotifyMap({
+  const res = await getSubOneSupervisionMap(departId, times);
-    departId: currentDepartId,
-    beginTime: time.value[0],
-    endTime: time.value[1]
-  });
   const mappedData = res.superviseTempMapVoList.map(item => {
     return {
       ...item,
@@ -862,7 +844,7 @@ const getSubOneSupervisionMapData = async () => {
     };
   });
   const total = mappedData.reduce((sum, item) => sum + Number(item.value), 0);
-  const avg = total / mappedData.length; // 计算平均<EFBFBD>?
+  const avg = total / mappedData.length; // 计算平均值
   const range30Percent = avg * 0.3   // 不用取整，小数也可以
   option.value.visualMap.pieces = [
     {gte: 0, lte: avg - range30Percent, label: "低于平均问题30%", color: "#4987F6"},
@@ -872,32 +854,41 @@ const getSubOneSupervisionMapData = async () => {
   superviseTempMapVoList.value = mappedData;
   option.value.series[0].data = mappedData;
 }
-const getSubOneSupervisionTrendData = async () => {
+const getSubOneSupervisionTrendData = async (departId, year) => {
-  const res = await getSubOneSupervisionTrend(currentDepartId, selectedYear.value)
+  const res = await getSubOneSupervisionTrend(departId, year)
   const supervisionTrend = res.supervisionTrend;
   const categories = supervisionTrend.map(item => item.name);
   const values = supervisionTrend.map(item => item.value);
   proTrend.value.xAxis.data = categories;
   proTrend.value.series[0].data = values;
 }
+const getSubOneYellowBetDrugData = async (departId, times) => {
+  const res = await getSubOneYellowBetDrug(departId, times)
+  fxsjYellowBetOverview.value = res.fxsjYellowBetOverview
+  jsdwYellowBetOverview.value = res.jsdwYellowBetOverview
+  fxsjYellowBetRankList.value = res.fxsjYellowBetRankList
+  jsdwYellowBetRankList.value = res.jsdwYellowBetRankList
+}
 
 
 
 
-const getSubOneWorkDynamicsData = async () => {
+const getSubOneWorkDynamicsData = async (departId, times) => {
-  const data = await getSubOneWorkDynamics(currentDepartId, time.value);
+  const data = await getSubOneWorkDynamics(departId, times);
   const colorNewsVoList = workDynamicColorMapping(data);
   messages.value = colorNewsVoList;
 }
 const getData = async () => {
-    getMapJSON(currentDepartId);
+ await Promise.all([
-    getSubOneSupervisionMapData();
+    getMapJSON(currentDepartId),
-    getSubOneChangedRankData();
+    getSubOneSupervisionMapData(currentDepartId, time.value),
-    getSubOneProblemTypeRateData();
+    getSubOneChangedRankData(currentDepartId, time.value),
-    getSubOneSupervisionNotifyCountData();
+    getSubOneProblemTypeRateData(currentDepartId, time.value),
-    getSubOneSupervisionTrendData();
+    getSubOneSupervisionNotifyCountData(currentDepartId, time.value),
-    getYellowBetDrugData();
+    getSubOneSupervisionTrendData(currentDepartId, selectedYear.value),
-    getSubOneWorkDynamicsData();
+    getYellowBetDrugData(currentDepartId, time.value),
+    getSubOneWorkDynamicsData(currentDepartId, time.value)
+  ]);
 }
 
 // endregion
@@ -931,17 +922,17 @@ const subOneSceneInspMapAnimation = () => {
     seriesIndex: 0,
   });
   mapTemp.dispatchAction({
-    type: "highlight", //highLight 高亮指定的数据图<EFBFBD>?
+    type: "highlight", //highLight 高亮指定的数据图形
     seriesIndex: 0, //系列index
     dataIndex: randomNum, //数据index
   });
   mapTemp.dispatchAction({
-    type: "showTip", //showTip 显示提示<EFBFBD>?
+    type: "showTip", //showTip 显示提示框
     seriesIndex: 0,
     dataIndex: randomNum,
   });
 };
-// 启动定时器，每隔 2 秒执行一<EFBFBD>?
+// 启动定时器，每隔 2 秒执行一次
 subOneSceneInspMapIntervalId = setInterval(subOneSceneInspMapAnimation, 2000);
 // 问题趋势动画
 const subOneSceneInspTrendAnimation = () => {
@@ -970,7 +961,7 @@ const subOneSceneInspZxdxRankAnimation = () => {
   }
 };
 subOneSceneInspZxdxIntervalId = setInterval(subOneSceneInspZxdxRankAnimation, 5000);
-// 工作动态动<EFBFBD>?
+// 工作动态动画
 const subOneSceneWorkDynamicsAnimation = () => {
   const sceneScrollTemp = subOneSceneScrollbar?.value;
   const maxScroll = sceneScrollTemp?.wrapRef?.scrollHeight - sceneScrollTemp?.wrapRef?.clientHeight;
@@ -1001,7 +992,7 @@ onMounted(() => {
 });
 const handleCommand = (year) => {
   selectedYear.value = year; // 更新当前选中的年份
-  getSubOneSupervisionTrendData();
+  getSubOneSupervisionTrendData(currentDepartId, selectedYear.value);
 };
 const handleClick = (params) => {
   const departId = params.data.departId;
@@ -1202,7 +1193,7 @@ const getNegativePageFun = async (row)=>{
     font-weight: 400;
     font-size: 16px;
     color: #FFFFFF;
-    border-bottom: 1px solid #253755; /* 设置下边<EFBFBD>?*/
+    border-bottom: 1px solid #253755; /* 设置下边框 */
   }
 
   .tooltip-content {