Browse Source

fix--案件核查大屏重构

master
parent
commit
df48c3907d
  1. 14
      src/api/screen/caseVerif.ts
  2. 38
      src/api/screen/subScreen/subOneCaseVerif.ts
  3. 22
      src/views/datav/CaseVerif.vue
  4. 74
      src/views/datav/subonedatav/SubOneCaseVerif.vue

14
src/api/screen/caseVerif.ts

@ -65,13 +65,21 @@ export function getCaseVerificationTrend(year) {
export function getCaseSourceRateAndDealSituation(times) {
return request.get({
url: `/datav/caseVerif/getCaseSourceRateAndDealSituation?beginTime=${times[0]}&endTime=${times[1]}`
// export function getCaseSourceRateAndDealSituation(times) {
// return request.get({
// url: `/datav/caseVerif/getCaseSourceRateAndDealSituation?beginTime=${times[0]}&endTime=${times[1]}`
// });
// }
export function getCaseSourceRateAndDealSituation(body) {
return request.post({
url: `/datav/caseVerif/getCaseSourceRateAndDealSituation`,
body
});
}
export function getConfinementAndPause(times) {
return request.get({
url: `/datav/caseVerif/getConfinementAndPause?beginTime=${times[0]}&endTime=${times[1]}`

38
src/api/screen/subScreen/subOneCaseVerif.ts

@ -1,9 +1,11 @@
import request from "@/api/request";
export function getSubOneCaseVerificationRank(departId, times) {
return request.get({
url: `/datav/sub1/caseVerif/getSubOneCaseVerificationRank?departId=${departId}&beginTime=${times[0]}&endTime=${times[1]}`
export function getSubOneCaseVerificationRank(body) {
return request.post({
url: `/datav/sub1/caseVerif/getSubOneCaseVerificationRank`,
body
});
}
@ -13,26 +15,42 @@ export function getSubOneCaseProblemProperty(departId, times) {
});
}
export function getSubOneAllCaseVerificationCount(departId, times) {
return request.get({
url: `/datav/sub1/caseVerif/getSubOneAllCaseVerificationCount?departId=${departId}&beginTime=${times[0]}&endTime=${times[1]}`
export function getSubOneAllCaseVerificationCount(body) {
return request.post({
url: `/datav/sub1/caseVerif/getSubOneAllCaseVerificationCount`,
body
});
}
export function getSubOneCaseVerificationMap(departId, times) {
return request.get({
url: `/datav/sub1/caseVerif/getSubOneCaseVerificationMap?departId=${departId}&beginTime=${times[0]}&endTime=${times[1]}`
export function getSubOneCaseVerificationMap(body) {
return request.post({
url: `/datav/sub1/caseVerif/getSubOneCaseVerificationMap`,
body
});
}
export function getSubOneCaseVerificationTrend(departId, year) {
return request.get({
url: `/datav/sub1/caseVerif/getSubOneCaseVerificationTrend?departId=${departId}&year=${year}`
});
}
// @Operation(summary = "案件来源占比 & 问责处理情况")
export function getSubOneCaseSourceRateAndDealSituation(body) {
return request.post({
url: `/datav/sub1/caseVerif/getSubOneCaseSourceRateAndDealSituation`,
body
});
}
export function getSubOneCaseSourceRateAndDealSituation(departId, times) {
export function getSubOneConfinementAndPause(departId, times) {
return request.get({
url: `/datav/sub1/caseVerif/getSubOneCaseSourceRateAndDealSituation?departId=${departId}&beginTime=${times[0]}&endTime=${times[1]}`
});

22
src/views/datav/CaseVerif.vue

@ -5,7 +5,7 @@
<main>
<el-row :gutter="16">
<el-col :span="6">
<datav-card title="分县市局排名" subTitle="问题数">
<datav-card title="分县市局排名" subTitle="查处问题数">
<datav-tabs
type="bottom-button"
v-model="caseVerifRankTab"
@ -127,22 +127,22 @@
<el-col :span="6">
<datav-card>
<datav-tabs>
<datav-tab-item label="问责处理情况" name="2">
<datav-tab-item label="案件来源占比" name="1">
<div class="mb-40">
<v-charts
style="height: 340px"
:option="wzclPieOption"
:option="ajlyPieOption"
autoresize
ref="caseSourceRate"
/>
</div>
</datav-tab-item>
<datav-tab-item label="案件来源占比" name="1">
<datav-tab-item label="问责处理情况" name="2">
<div class="mb-40">
<v-charts
style="height: 340px"
:option="ajlyPieOption"
:option="wzclPieOption"
autoresize
ref="caseSourceRate"
/>
</div>
</datav-tab-item>
@ -578,8 +578,12 @@ const getCaseVerificationTrendData = async (year) => {
proTrend.value.xAxis.data = categories;
proTrend.value.series[0].data = values;
}
const getCaseSourceRateAndDealSituationData = async (timeValue) => {
const res = await getCaseSourceRateAndDealSituation(timeValue);
const getCaseSourceRateAndDealSituationData = async () => {
const body = {
beginTime: time.value[0],
endTime: time.value[1],
}
const res = await getCaseSourceRateAndDealSituation(body);
ajlyPieOption.value.series[0].data = res.caseSourceRateList
// ajlyPieOption.value.series[0].data = circularChart
wzclPieOption.value.series[0].data = res.dealSituationPieList
@ -597,7 +601,7 @@ async function getData() {
// getCaseProblemPropertyData(time.value)
getCaseVerificationCountData(),
getCaseVerificationTrendData(selectedYear.value),
getCaseSourceRateAndDealSituationData(time.value),
getCaseSourceRateAndDealSituationData(),
// getConfinementAndPauseData(time.value);
getCaseTypeFun(time.value),
getConfinementBarFun(time.value),

74
src/views/datav/subonedatav/SubOneCaseVerif.vue

@ -5,7 +5,7 @@
<main>
<el-row :gutter="16">
<el-col :span="6">
<datav-card title="所队排名" subTitle="案件数">
<datav-card title="所队排名" subTitle="查处问题数">
<datav-tabs
type="bottom-button"
v-model="subOneCaseVerifRankTab"
@ -159,15 +159,15 @@
/>
</div>
</datav-tab-item>
<datav-tab-item label="停职处理情况" name="2" style="display: none">
<div class="mb-40">
<v-charts
style="height: 340px"
:option="tzcloption"
autoresize
/>
</div>
</datav-tab-item>
<!-- <datav-tab-item label="停职处理情况" name="2" style="display: none">-->
<!-- <div class="mb-40">-->
<!-- <v-charts-->
<!-- style="height: 340px"-->
<!-- :option="tzcloption"-->
<!-- autoresize-->
<!-- />-->
<!-- </div>-->
<!-- </datav-tab-item>-->
</datav-tabs>
</datav-card>
</el-col>
@ -190,7 +190,7 @@ import {
getSubOneCaseSourceRateAndDealSituation,
getSubOneCaseVerificationMap,
getSubOneCaseVerificationRank,
getSubOneCaseVerificationTrend
getSubOneCaseVerificationTrend, getSubOneConfinementAndPause
} from "@/api/screen/subScreen/subOneCaseVerif.ts";
import {circularChart} from "@/views/datav/simulateData/AnimationTestData.js";
import SubOneHeader from "@/components/datav/subOne/subOneHeader.vue";
@ -534,8 +534,13 @@ const getMapJSON = async (departId) => {
echarts.registerMap("changsha", res);
subOneCaseVerifMap.value.chart.setOption(option.value);
}
const getSubOneCaseVerificationRankData = async (departId, timeValue) => {
const res = await getSubOneCaseVerificationRank(departId, timeValue);
const getSubOneCaseVerificationRankData = async () => {
const body = {
beginTime: time.value[0],
endTime: time.value[1],
departId: route.query.departId
}
const res = await getSubOneCaseVerificationRank(body);
fxsjBarList.value = res.fxsjRankList
jsdwBarList.value = res.jsdwRankList
}
@ -544,12 +549,24 @@ const getSubOneCaseProblemPropertyData = async (departId, timeValue) => {
zfbaPieOption.value.series[0].data = res.zfbaPieList;
fwglPieOption.value.series[0].data = res.fwglPieList;
}
const getSubOneAllCaseVerificationCountData = async (departId, timeValue) => {
const res = await getSubOneAllCaseVerificationCount(departId, timeValue)
const getSubOneAllCaseVerificationCountData = async () => {
const body = {
beginTime: time.value[0],
endTime: time.value[1],
departId: route.query.departId
}
const res = await getSubOneAllCaseVerificationCount(body)
overview.value = res.overview
}
const getSubOneCaseVerificationMapData = async (departId, timeValue) => {
const res = await getSubOneCaseVerificationMap(departId, timeValue);
const getSubOneCaseVerificationMapData = async () => {
const body = {
beginTime: time.value[0],
endTime: time.value[1],
departId: route.query.departId
}
const res = await getSubOneCaseVerificationMap(body);
const mappedData = res.caseVerificationMapList.map(item => {
return {
...item,
@ -575,8 +592,13 @@ const getSubOneCaseVerificationTrendData = async (departId, year) => {
proTrend.value.xAxis.data = categories;
proTrend.value.series[0].data = values;
}
const getSubOneCaseSourceRateAndDealSituationData = async (departId, timeValue) => {
const res = await getSubOneCaseSourceRateAndDealSituation(departId, timeValue);
const getSubOneCaseSourceRateAndDealSituationData = async () => {
const body = {
beginTime: time.value[0],
endTime: time.value[1],
departId: route.query.departId
}
const res = await getSubOneCaseSourceRateAndDealSituation(body);
ajlyPieOption.value.series[0].data = res.caseSourceRateList
wzclPieOption.value.series[0].data = res.dealSituationPieList
}
@ -589,18 +611,24 @@ const getSubOneCaseSourceRateAndDealSituationData = async (departId, timeValue)
// }
function getData() {
getMapJSON(currentDepartId)
getSubOneCaseVerificationRankData(currentDepartId, time.value)
getSubOneCaseVerificationRankData()
getSubOneCaseProblemPropertyData(currentDepartId, time.value)
getSubOneAllCaseVerificationCountData(currentDepartId, time.value)
getSubOneAllCaseVerificationCountData()
getSubOneCaseVerificationMapData(currentDepartId, time.value)
getSubOneCaseVerificationTrendData(currentDepartId, currentYear)
getSubOneCaseSourceRateAndDealSituationData(currentDepartId, time.value)
// getConfinementAndPauseList(currentDepartId, time.value)
getSubOneCaseSourceRateAndDealSituationData()
getSubOneConfinementAndPauseData(currentDepartId, time.value)
}
// endregion
const getSubOneConfinementAndPauseData = async(departId, timeValue) =>{
const res = await getSubOneConfinementAndPause(departId, timeValue);
jbcloption.value.series[0].data=res.confinementList;
}
// region
//
const subOneCaseVerifRankAnimation = () => {

Loading…
Cancel
Save