diff --git a/src/api/data/risk.ts b/src/api/data/risk.ts index a68a24e..f3cea26 100644 --- a/src/api/data/risk.ts +++ b/src/api/data/risk.ts @@ -78,4 +78,22 @@ export function policeLeaderNegativeStatistics() { }); } +// ******************************************* +export function areaRateStatistics() { + return request.get({ + url: `/datav/risk/area/rate/statistics` + }); +} + +export function orgRateStatistics() { + return request.get({ + url: `/datav/risk/org/rate/statistics` + }); +} + +export function orgCarRateStatistics() { + return request.get({ + url: `/datav/risk/org/car/rate/statistics` + }); +} diff --git a/src/style/datav.scss b/src/style/datav.scss index de4ef42..df86257 100644 --- a/src/style/datav.scss +++ b/src/style/datav.scss @@ -9,7 +9,6 @@ .col { --label-width: 66px; - label { color: #5574E1; text-align: left; diff --git a/src/views/datav/Lmgz.vue b/src/views/datav/Lmgz.vue index 2e02438..9063e70 100644 --- a/src/views/datav/Lmgz.vue +++ b/src/views/datav/Lmgz.vue @@ -57,7 +57,7 @@ @@ -67,17 +67,17 @@ - + @@ -90,31 +90,31 @@ - + - + - + @@ -127,31 +127,31 @@ - + - + - + @@ -167,31 +167,21 @@ - + - + - - - - - @@ -204,31 +194,21 @@ - + - + - - - - - @@ -241,31 +221,21 @@ - + - + - - - - - @@ -292,7 +262,10 @@ import { orgCarNegativeStatistics, policeANegativeStatistics, policeBNegativeStatistics, - policeLeaderNegativeStatistics + policeLeaderNegativeStatistics, + areaRateStatistics, + orgRateStatistics, + orgCarRateStatistics } from '@/api/data/risk'; @@ -317,6 +290,10 @@ let policeANegativeList = ref([]) let policeBNegativeList = ref([]) let leaderNegativeList = ref([]) +let areaRateList = ref([]) +let orgRateList = ref([]) +let orgCarRateList = ref([]) + onMounted(() => { getTotalData(); getAreaRiskData(); @@ -331,6 +308,9 @@ onMounted(() => { getAreaNegativeData(); getCarOrgNegativeData(); getOrgNegativeData(); + getAreaRateData(); + getOrgRateData(); + getCarOrgRateData(); }); const getTotalData = () => { @@ -414,6 +394,25 @@ const getLeaderNegativeData = () => { }) } + +const getAreaRateData = () => { + areaRateStatistics().then(res => { + areaRateList.value = eachData(res) + }) +} + +const getOrgRateData = () => { + orgRateStatistics().then(res => { + orgRateList.value = eachData(res) + }) +} + +const getCarOrgRateData = () => { + orgCarRateStatistics().then(res => { + orgCarRateList.value = eachData(res) + }) +} + const eachData = (data) => { let arr = [] data.forEach(item => { @@ -435,7 +434,7 @@ const colors = [ percentage: 60, }, { - color: "linear-gradient( 270deg, #63E700 0%, #19674C 100%)", + color: "linear-gradient( 270deg, #63E7AA 0%, #19674C 100%)", percentage: 40, }, ];