From e449d5687b3ea339d2fd62da8cd93ed61ed7d2ce Mon Sep 17 00:00:00 2001 From: zhaotiantian <18710962446@163.com> Date: Mon, 11 Dec 2023 18:28:52 +0800 Subject: [PATCH] =?UTF-8?q?=E7=BB=84=E4=BB=B6=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/item-d/item-d.vue | 128 +++--- src/components/item-d/pieCharts.ts | 6 +- .../secondaryScreen/screen-left/PieCharts.vue | 58 +++ .../screen-right/screenRightHooks.ts | 4 +- .../secondaryScreen/screen-right/threeR.vue | 13 +- .../secondaryScreen/screen-right/twoR.vue | 90 ++--- src/views/indexSon.vue | 378 ++++++++---------- 7 files changed, 349 insertions(+), 328 deletions(-) create mode 100644 src/components/secondaryScreen/screen-left/PieCharts.vue diff --git a/src/components/item-d/item-d.vue b/src/components/item-d/item-d.vue index 5bd8b1d..5fb19bb 100644 --- a/src/components/item-d/item-d.vue +++ b/src/components/item-d/item-d.vue @@ -1,76 +1,76 @@ - - - - {{ props.tips }} - - - - + + + + {{ props.tips }} + + + + diff --git a/src/components/item-d/pieCharts.ts b/src/components/item-d/pieCharts.ts index 35cc2e1..895109d 100644 --- a/src/components/item-d/pieCharts.ts +++ b/src/components/item-d/pieCharts.ts @@ -1,4 +1,4 @@ -export function screenPie(chartData, total, color) { +export function screenPie(chartData, total, color, formatter) { return { title: { text: '总人数', @@ -31,7 +31,7 @@ export function screenPie(chartData, total, color) { top: 'center', orient: 'vertical', icon: 'circle', - itemGap: 26, + itemGap: 16, textStyle: { color: '#ffffff', fontSize: 16, @@ -46,7 +46,7 @@ export function screenPie(chartData, total, color) { label: { show: true, position: 'inner', - formatter: '{d}%', + formatter: formatter, color: '#ffffff', fontSize: 14, }, diff --git a/src/components/secondaryScreen/screen-left/PieCharts.vue b/src/components/secondaryScreen/screen-left/PieCharts.vue new file mode 100644 index 0000000..dd1d60c --- /dev/null +++ b/src/components/secondaryScreen/screen-left/PieCharts.vue @@ -0,0 +1,58 @@ + + + + + + + + + \ No newline at end of file diff --git a/src/components/secondaryScreen/screen-right/screenRightHooks.ts b/src/components/secondaryScreen/screen-right/screenRightHooks.ts index c0f5473..9133ba1 100644 --- a/src/components/secondaryScreen/screen-right/screenRightHooks.ts +++ b/src/components/secondaryScreen/screen-right/screenRightHooks.ts @@ -6,7 +6,7 @@ export function sleepCharts() { top: '15%', left: '8%', right: '3%', - bottom: '18%', + bottom: '20%', }, legend: { data: ['清醒', '浅睡', '深睡'], @@ -68,7 +68,7 @@ export function useHealth() { const healthData = ref([ { name: '5000以下', - value: '0', + value: '23', type: '1', type_dictText: '恶性肿瘤', }, diff --git a/src/components/secondaryScreen/screen-right/threeR.vue b/src/components/secondaryScreen/screen-right/threeR.vue index c519039..7436aab 100644 --- a/src/components/secondaryScreen/screen-right/threeR.vue +++ b/src/components/secondaryScreen/screen-right/threeR.vue @@ -9,10 +9,10 @@ :pagination="tableInfo.pagination" :rowClassName="(record, index) => (index % 2 === 1 ? 'table-default' : 'table-striped')" > - + - {{ text }} - + {{ record.address }} + @@ -59,7 +59,6 @@ const tableInfo = ref({ }, { title: '住址', - dataIndex: 'address', key: 'address', align: 'center', slots: {customRender: 'address'} @@ -68,9 +67,13 @@ const tableInfo = ref({ pagination: { current: 1, pageSize: 2, - total: 2, + total: 10, }, }); + +function handlePoliceDetail(record) { + console.log(record) +} diff --git a/src/views/indexSon.vue b/src/views/indexSon.vue index 368fc9b..364f20e 100644 --- a/src/views/indexSon.vue +++ b/src/views/indexSon.vue @@ -1,234 +1,194 @@ - - - + + + - + 返回 - - 应急就医服务中心 - 累计运行时间:{{ dayTimeT }} - - - - - - - - - - - - - - - - - - - - - - + + 应急就医服务中心 + 累计运行时间:{{ dayTimeT }} + + + + + + + + + + + + + + + + + + + + \ No newline at end of file