diff --git a/src/views/activity/component/statistics/index.vue b/src/views/activity/component/statistics/index.vue index d33ee3d..349d79e 100644 --- a/src/views/activity/component/statistics/index.vue +++ b/src/views/activity/component/statistics/index.vue @@ -174,7 +174,17 @@ async function getCompleteData() { const completePie = [{ name: '已测', value: finishNum }, { name: '未测', value: noneNum }] completePieOption.value.series[0].data = completePie - const seriesData = [{ name: '已测', data: seriesFinishData, type: 'bar' }, { name: '未测', data: seriesNoneData, type: 'bar' }] + const seriesData = [{ + name: '已测', data: seriesFinishData, type: 'bar', label: { + show: true, + position: 'top' + } + }, { + name: '未测', data: seriesNoneData, type: 'bar', label: { + show: true, + position: 'top' + }, + }] completeBarOption.value.xAxis.data = xAxisData completeBarOption.value.series = seriesData } @@ -224,7 +234,12 @@ async function getwarnData() { let xAxisData = ['未见异常', '低风险', '中风险', '高风险', '重大风险'] let seriesList = [noneNum, lowNum, middleNum, highNum, majorNum] - const seriesData = [{ data: seriesList, type: 'bar' }] + const seriesData = [{ + data: seriesList, type: 'bar', label: { + show: true, + position: 'top' + } + }] warBarOption.value.xAxis.data = xAxisData warBarOption.value.series = seriesData } @@ -291,6 +306,19 @@ function initPieOption(name = '', data) { type: 'pie', radius: '50%', data: data, + label: { + normal: { + formatter: ['{c|{c}人}', '{b|{b}}'].join('\n'), + rich: { + c: { + lineHeight: 5 + }, + b: { + height: 44 + }, + }, + } + }, emphasis: { itemStyle: { shadowBlur: 10, diff --git a/src/views/archive/information/index.vue b/src/views/archive/information/index.vue index 8efd8eb..a1e4c41 100644 --- a/src/views/archive/information/index.vue +++ b/src/views/archive/information/index.vue @@ -202,29 +202,6 @@ const dialog = reactive({ const activeName = ref('static') const current = ref({ userId: '', nickName: '' }) -const tableData = [ - { - date: '2016-05-03', - name: 'Tom', - address: 'No. 189, Grove St, Los Angeles', - }, - { - date: '2016-05-02', - name: 'Tom', - address: 'No. 189, Grove St, Los Angeles', - }, - { - date: '2016-05-04', - name: 'Tom', - address: 'No. 189, Grove St, Los Angeles', - }, - { - date: '2016-05-01', - name: 'Tom', - address: 'No. 189, Grove St, Los Angeles', - }, -] - function handleSituation(situation: any) { if (situation == 1) { return '未见异常' diff --git a/src/views/archive/interveneRecord/index.vue b/src/views/archive/interveneRecord/index.vue index a5094f8..ef2e23d 100644 --- a/src/views/archive/interveneRecord/index.vue +++ b/src/views/archive/interveneRecord/index.vue @@ -42,8 +42,12 @@