审计督察拆分

src/api/data/supervisionNotify.ts

@@ -45,20 +45,27 @@ export function getSupervisionTrend(year) {
 /**
  * 获取地图数据
  */
-export function getSupervisionNotifyMap(times) {
+export function getSupervisionNotifyMap(body) {
-    return request.get({
+    return request.post({
-        url: `/datav/supervisonNotify/getSupervisionNotifyMap?beginTime=${times[0]}&endTime=${times[1]}`
+        url: `/datav/supervisonNotify/getSupervisionNotifyMap`,
+        body
     });
 }
 
 
-
 /**
  * 黄赌毒数据
  */
-export function getYellowBetDrug(times, dictValue) {
+// export function getYellowBetDrug(times, dictValue) {
-    return request.get({
+//     return request.get({
-        url: `/datav/supervisonNotify/getYellowBetDrug?beginTime=${times[0]}&endTime=${times[1]}&dictValue=${dictValue}`
+//         url: `/datav/supervisonNotify/getYellowBetDrug?beginTime=${times[0]}&endTime=${times[1]}&dictValue=${dictValue}`
+//     });
+// }
+
+export function getYellowBetDrug(body) {
+    return request.post({
+        url: `/datav/supervisonNotify/getYellowBetDrug`,
+        body
     });
 }
 

src/api/screen/subScreen/subOneVideoSupervise.ts

@@ -4,22 +4,48 @@ import request from "@/api/request";
 
 
 
-export function getSubOneVideoSuperviseProblemRank(departId,times) {
+// export function getSubOneVideoSuperviseProblemRank(departId,times) {
-    return request.get({
+//     return request.get({
-        url: `/datav/sub1/videoSupervise/getSubOneVideoSuperviseProblemRank?departId=${departId}&beginTime=${times[0]}&endTime=${times[1]}`
+//         url: `/datav/sub1/videoSupervise/getSubOneVideoSuperviseProblemRank?departId=${departId}&beginTime=${times[0]}&endTime=${times[1]}`
+//     });
+// }
+
+
+export function getSubOneVideoSuperviseProblemRank(body) {
+    return request.post({
+        url: `/datav/sub1/videoSupervise/getSubOneVideoSuperviseProblemRank`,
+        body
     });
 }
 
 
-export function getSubOneAllVideoSuperviseCount(departId,times) {
+export function getSubOneAllVideoSuperviseCount(body) {
-    return request.get({
+    return request.post({
-        url: `/datav/sub1/videoSupervise/getSubOneAllVideoSuperviseCount?departId=${departId}&beginTime=${times[0]}&endTime=${times[1]}`
+        url: `/datav/sub1/videoSupervise/getSubOneAllVideoSuperviseCount`,
+        body
     });
 }
 
-export function getSubOneVideoSuperviseMap(departId,times) {
+
-    return request.get({
+// export function getSubOneAllVideoSuperviseCount(departId,times) {
-        url: `/datav/sub1/videoSupervise/getSubOneVideoSuperviseMap?departId=${departId}&beginTime=${times[0]}&endTime=${times[1]}`
+//     return request.get({
+//         url: `/datav/sub1/videoSupervise/getSubOneAllVideoSuperviseCount?departId=${departId}&beginTime=${times[0]}&endTime=${times[1]}`
+//     });
+// }
+
+
+
+
+// export function getSubOneVideoSuperviseMap(departId,times) {
+//     return request.get({
+//         url: `/datav/sub1/videoSupervise/getSubOneVideoSuperviseMap?departId=${departId}&beginTime=${times[0]}&endTime=${times[1]}`
+//     });
+// }
+
+export function getSubOneVideoSuperviseMap(body) {
+    return request.post({
+        url: `/datav/sub1/videoSupervise/getSubOneVideoSuperviseMap`,
+        body
     });
 }
 

src/api/screen/videoSupervise.ts

@@ -10,19 +10,36 @@ export function getVideoSuperviseProblemRank(body) {
 }
 
 // 视频督察大屏总览数据
-export function getAllVideoSuperviseCount(times) {
+// export function getAllVideoSuperviseCount(times) {
-    return request.get({
+//     return request.get({
-        url: `/datav/videoSupervise/getAllVideoSuperviseCount?beginTime=${times[0]}&endTime=${times[1]}`
+//         url: `/datav/videoSupervise/getAllVideoSuperviseCount?beginTime=${times[0]}&endTime=${times[1]}`
+//     });
+// }
+
+export function getAllVideoSuperviseCount(body) {
+    return request.post({
+        url: `/datav/videoSupervise/getAllVideoSuperviseCount`,
+        body
     });
 }
 
+
 // 视频督察地图数据
-export function getVideoSuperviseMap(times) {
+// export function getVideoSuperviseMap(times) {
-    return request.get({
+//     return request.get({
-        url: `/datav/videoSupervise/getVideoSuperviseMap?beginTime=${times[0]}&endTime=${times[1]}`
+//         url: `/datav/videoSupervise/getVideoSuperviseMap?beginTime=${times[0]}&endTime=${times[1]}`
+//     });
+// }
+
+export function getVideoSuperviseMap(body) {
+    return request.post({
+        url: `/datav/videoSupervise/getVideoSuperviseMap`,
+        body
     });
 }
 
+
+
 // 视频督察问题趋势
 export function getVideoSuperviseTrend(year) {
     return request.get({

src/views/datav/Jwpy.vue

@@ -292,10 +292,46 @@ const time = ref([
 const getDistributionFun = async()=>{
   console.log('---------')
   const res = await selectDistribution(time.value);
-  option4.value.series[0].data=res.total;
+
-  option4.value.series[1].data=res.checkStatus;
+  // 准备数据
-  // option4.value.series[2].data=res.checkStatus;
+  const names = res.name;
-  option4.value.yAxis.data=res.name;
+  const totalData = res.total;
+  const checkStatusData = res.checkStatus;
+
+  // 组合数据并排序
+  const combinedData = names.map((name, index) => ({
+    name: name,
+    total: totalData[index],
+    checkStatus: checkStatusData[index]
+  }));
+
+  // 按照下发数排序
+  // combinedData.sort((a, b) => b.total - a.total);
+  combinedData.sort((a, b) => a.total - b.total);
+  // 更新图表配置
+  option4.value.yAxis.data = combinedData.map(item => item.name);
+  option4.value.series[0].data = combinedData.map(item => ({
+    value: item.checkStatus,
+    itemStyle: {
+      color: '#4987F6'
+    },
+    label: {
+      show: true,
+      position: 'right',
+      color: '#fff',
+      formatter: (params) => {
+        const item = combinedData[params.dataIndex];
+        return `${item.checkStatus}/${item.total}`;
+      }
+    }
+  }));
+  option4.value.series[1].data = combinedData.map(item => ({
+    value: item.total - item.checkStatus,
+    itemStyle: {
+      color: '#193775'
+    }
+  }));
+
   console.log('option4',option4.value)
 
 }
@@ -329,14 +365,14 @@ const toggleSelect=()=> {
 const handleYearChange = (checkedYear) => {
   toggleSelect()
 
-   yearValue.value= years.value.find(s=>s.ID == checkedYear).PeriodName;
+  yearValue.value= years.value.find(s=>s.ID == checkedYear).PeriodName;
   console.log("年份" + selectYear.value + "  月份" + selectMonth.value + " 单位" + selectOrg.value + " task" + task.value)
   getData();
 
 }
 const handleMonthChange = (checkedMonth) => {
   toggleSelect()
-   monthValue.value= months.value.find(s=>s.ID === checkedMonth).SonPeriodName;
+  monthValue.value= months.value.find(s=>s.ID === checkedMonth).SonPeriodName;
   console.log(monthValue.value)
   console.log("年份" + selectYear.value + "  月份" + selectMonth.value + " 单位" + selectOrg.value + " task" + task.value)
   getData();
@@ -648,9 +684,23 @@ const option3 = ref({
   grid: {left: '8%', right: '0%', top: '10%', bottom: '10%'},
 });
 const option4 = ref({
-  tooltip: {},
+  tooltip: {
+    trigger: 'axis',
+    axisPointer: {
+      type: 'shadow'
+    },
+    formatter: function(params) {
+      const check = params[0].value;
+      const remaining = params[1].value;
+      const total = check + remaining;
+      return `${params[0].name}<br/>
+              下发数: ${total}<br/>
+              查实数: ${check}<br/>
+              占比: ${((check/total)*100).toFixed(1)}%`;
+    }
+  },
   legend: {
-    data: ['下发数', '查实数'],
+    data: ['查实数', '下发数'],
     textStyle: {
       color: '#fff',
     },
@@ -681,54 +731,27 @@ const option4 = ref({
   },
   series: [
     {
-      name: '下发数',
+      name: '查实数',
       type: 'bar',
+      stack: 'total',
+      barWidth: '60%',
       data: [],
-      label: {
-        show: true,
-        position: 'right',
-        color:'#fff'
-      },
       itemStyle: {
-        color: new echarts.graphic.LinearGradient(0, 0, 0, 1, [{
+        color: '#4987F6'
-          offset: 0,
+      }
-          color: 'rgba(40,230,255,0.63)'
-        }, {offset: 1, color: 'rgba(40,230,255,0)'}])
-      },
     },
     {
-      name: '查实数',
+      name: '下发数',
       type: 'bar',
+      stack: 'total',
+      barWidth: '60%',
       data: [],
-      label: {
-        show: true,
-        position: 'right',
-        color:'#fff'
-      },
       itemStyle: {
-        color: new echarts.graphic.LinearGradient(0, 0, 0, 1,
+        color: '#193775'
-            [{offset: 0, color: 'rgba(255,218,51,0.52)'},
+      },
-              {offset: 1, color: 'rgba(255,219,49,0)'}])
+    }
-      }
-    },
-    // {
-    //   name: '办结数',
-    //   type: 'bar',
-    //   data: [],
-    //   label: {
-    //     show: true,
-    //     position: 'right',
-    //     color:'#fff'
-    //   },
-    //   itemStyle: {
-    //     color: new echarts.graphic.LinearGradient(0, 0, 0, 1, [{
-    //       offset: 0,
-    //       color: '#6FDBA0'
-    //     }, {offset: 1, color: '#6FDBA0'}])
-    //   }
-    // }
   ],
-  grid: {left: '17%', right: '0%', top: '10%', bottom: '10%'},
+  grid: {left: '17%', right: '15%', top: '10%', bottom: '10%'},
 });
 
 

src/views/datav/SceneInsp.vue

@@ -980,8 +980,11 @@ const getSupervisionNotifyCountData = async () => {
 
 
 const getSupervisionNotifyMapData = async () => {
-
+  const body = {
-    const res = await getSupervisionNotifyMap(time.value);
+    beginTime: time.value[0],
+    endTime: time.value[1]
+  }
+    const res = await getSupervisionNotifyMap(body);
 
     let mappedData = mapOrgNameMapping(
         res.superviseTempMapVoList,
@@ -1024,7 +1027,12 @@ const getSupervisionTrendData = async () => {
     proTrend.value.series[0].data = values;
 };
 const getYellowBetDrugData = async () => {
-    const res = await getYellowBetDrug(time.value, zxdcProRankTab.value);
+    const body = {
+      beginTime: time.value[0],
+      endTime: time.value[1],
+      specialSupervision: zxdcProRankTab.value
+    }
+    const res = await getYellowBetDrug(body);
     rightOverview.value = res.overView;
     fxsjYellowBetOverview.value = res.countyOverview;
     jsdwYellowBetOverview.value = res.bureauOverview;

src/views/datav/VideoInsp.vue

@@ -366,8 +366,8 @@ const option = ref({
             <ul class="tooltip-ul" >
               <li>查实问题数 <span>${dataItem.discoverProblem}</span></li>
               <li>办结问题数 <span>${dataItem.completionProblem}</span></li>
-              <li>涉及单位数 <span>${dataItem.relativeOrg}</span></li>
+              <li>问责单位数 <span>${dataItem.relativeOrg}</span></li>
-              <li>涉及人数 <span>${dataItem.relativePer}</span></li>
+              <li>问责人次<span>${dataItem.relativePer}</span></li>
 
             </ul>
           </div>
@@ -472,12 +472,20 @@ const getVideoSuperviseProblemRankData = async () => {
 
     jsdwRankList.value = res.jsdwVideoSuperviseProblemRankList;
 };
-const getAllVideoSuperviseCountData = async (timeValue) => {
+const getAllVideoSuperviseCountData = async () => {
-    const res = await getAllVideoSuperviseCount(timeValue);
+  const body = {
+    beginTime: time.value[0],
+    endTime: time.value[1]
+  }
+    const res = await getAllVideoSuperviseCount(body);
     overview.value = res.overview;
 };
-const getVideoSuperviseMapData = async (timeValue) => {
+const getVideoSuperviseMapData = async () => {
-    const res = await getVideoSuperviseMap(timeValue);
+    const body = {
+      beginTime: time.value[0],
+      endTime: time.value[1]
+    }
+    const res = await getVideoSuperviseMap(body);
     const mappedData = mapOrgNameMapping(
         res.videoSuperviseMapIconVoList,
         "discoverProblem"
@@ -524,9 +532,12 @@ const getVideoSuperviseProblemTypeRateData = async (timeValue) => {
 
 const getData = async () => {
   getVideoSuperviseProblemRankData();
+  getAllVideoSuperviseCountData();
+  getVideoSuperviseMapData();
+
      Promise.all([
-       getAllVideoSuperviseCountData(time.value),
+       // getAllVideoSuperviseCountData(time.value),
-       getVideoSuperviseMapData(time.value),
+       // getVideoSuperviseMapData(time.value),
        getVideoSuperviseTrendData(selectedYear.value),
        getVideoSuperviseProblemTypeRateData(time.value)
      ])

src/views/datav/subonedatav/SubOneVideoInsp.vue

@@ -457,21 +457,37 @@ const getMapJSON = async (departId) => {
     subOneVideoMapChart.value.chart.setOption(option.value);
 };
 
-const getSubOneVideoSuperviseProblemRankData = async (departId, timeValue) => {
+const getSubOneVideoSuperviseProblemRankData = async () => {
-    const res = await getSubOneVideoSuperviseProblemRank(departId, timeValue);
+
+  const body = {
+    beginTime: time.value[0],
+    endTime: time.value[1],
+    departId: currentDepartId
+  }
+    const res = await getSubOneVideoSuperviseProblemRank(body);
     fxsjRankList.value = res.policeVideoSuperviseProblemRankList;
     jsdwRankList.value = res.teamVideoSuperviseProblemRankList;
 };
-const getSubOneAllVideoSuperviseCountData = async (departId, timeValue) => {
+const getSubOneAllVideoSuperviseCountData = async () => {
-    const res = await getSubOneAllVideoSuperviseCount(departId, timeValue);
+  const body = {
+    beginTime: time.value[0],
+    endTime: time.value[1],
+    departId: currentDepartId
+  }
+    const res = await getSubOneAllVideoSuperviseCount(body);
     overview.value = res.overview;
 };
 //跳转客户端
 const titleClickFun =()=>{
   window.open("http://65.47.26.34")
 }
-const getSubOneVideoSuperviseMapData = async (departId, timeValue) => {
+const getSubOneVideoSuperviseMapData = async () => {
-    const res = await getSubOneVideoSuperviseMap(departId, timeValue);
+  const body = {
+    beginTime: time.value[0],
+    endTime: time.value[1],
+    departId: currentDepartId
+  }
+    const res = await getSubOneVideoSuperviseMap(body);
     const mappedData = res.videoSuperviseMapIconVoList.map((item) => {
         return {
             ...item,
@@ -524,9 +540,9 @@ const getSubOneVideoSuperviseProblemTypeRateData = async (
 
 const getData = async () => {
     getMapJSON(currentDepartId);
-    getSubOneVideoSuperviseProblemRankData(currentDepartId, time.value);
+    getSubOneVideoSuperviseProblemRankData();
-    getSubOneAllVideoSuperviseCountData(currentDepartId, time.value);
+    getSubOneAllVideoSuperviseCountData();
-    getSubOneVideoSuperviseMapData(currentDepartId, time.value);
+    getSubOneVideoSuperviseMapData();
     getSubOneVideoSuperviseTrendData(currentDepartId, selectedYear.value);
     getSubOneVideoSuperviseProblemTypeRateData(currentDepartId, time.value);
 };