diff --git a/src/assets/less/index.less b/src/assets/less/index.less index de0a954..17d572a 100644 --- a/src/assets/less/index.less +++ b/src/assets/less/index.less @@ -1,106 +1,63 @@ .type-time { - padding-right: 4%; - padding-top: 3%; - font-size: 16px; - display: flex; - justify-content: right; + padding-right: 4%; + padding-top: 3%; + font-size: 16px; + display: flex; + justify-content: right; - span { - padding: 0 2%; - cursor: pointer; - } - - .select { - color: #45a2ff; - position: relative; - - &:after { - content: ''; - position: absolute; - display: block; - width: 72%; - left: 6px; - bottom: -12px; - height: 6px; - background: url('../images/light.png') no-repeat; - background-size: 100% 100%; + span { + padding: 0 2%; + cursor: pointer; } - } - .unSelect { - color: #a3a4a4; - } + .select { + color: #45a2ff; + position: relative; + + &:after { + content: ''; + position: absolute; + display: block; + width: 72%; + left: 6px; + bottom: -12px; + height: 6px; + background: url('../images/light.png') no-repeat; + background-size: 100% 100%; + } + } + + .unSelect { + color: #a3a4a4; + } } *::-webkit-scrollbar { - width: 12px; - height: 12px; + width: 12px; + height: 12px; } *::-webkit-scrollbar-button { - width: 0; - height: 0; - display: none; + width: 0; + height: 0; + display: none; } *::-webkit-scrollbar-corner { - background-color: transparent; + background-color: transparent; } *::-webkit-scrollbar-thumb { - border: 4px solid rgba(0, 0, 0, 0); - height: 6px; - border-radius: 25px; - background-clip: padding-box; - background-color: rgba(0, 0, 0, 0.3); -} - -/* - antd表格样式 -*/ -.ant-table-thead > tr > th { - border-bottom: 1px solid #1e73c2 !important; -} - -.ant-table-body { - background-color: #00152b; -} - -.ant-modal-header { - border-bottom: none !important; -} - -.ant-table-tbody > tr > td { - border-bottom: 1px solid #1e73c2 !important; - background-color: #00152b; - color: #ffffff; -} - -.ant-table-tbody > tr.ant-table-row:hover > td, -.ant-table-tbody > tr > td.ant-table-cell-row-hover, -.ant-table-thead > tr > th { - background-color: #00152b !important; - color: #ffffff !important; -} - -.ant-table-cell-scrollbar { - box-shadow: none !important; -} - -/* - 表格滚动条 -*/ -.ant-table-body::-webkit-scrollbar-thumb { - border: 4px solid rgba(0, 0, 0, 0); - height: 6px; - border-radius: 25px; - background-clip: padding-box; - background-color: rgba(30, 115, 194, 0.3); + border: 4px solid rgba(0, 0, 0, 0); + height: 6px; + border-radius: 25px; + background-clip: padding-box; + background-color: rgba(0, 0, 0, 0.3); } .helicopter { - width: 60px; - height: 60px; - background: url("../img/helicopter.png") no-repeat; - background-size: 100% 100%; -} \ No newline at end of file + width: 60px; + height: 60px; + background: url('../img/helicopter.png') no-repeat; + background-size: 100% 100%; +} diff --git a/src/components/body-d-left/oneL.vue b/src/components/body-d-left/oneL.vue index d1d2854..8457a17 100644 --- a/src/components/body-d-left/oneL.vue +++ b/src/components/body-d-left/oneL.vue @@ -105,4 +105,4 @@ } } } - \ No newline at end of file + diff --git a/src/components/body-d-left/threeL.vue b/src/components/body-d-left/threeL.vue index 7feec2c..e772307 100644 --- a/src/components/body-d-left/threeL.vue +++ b/src/components/body-d-left/threeL.vue @@ -112,4 +112,4 @@ } } } - \ No newline at end of file + diff --git a/src/components/body-d-left/twoL.vue b/src/components/body-d-left/twoL.vue index 7d70697..37b9f3d 100644 --- a/src/components/body-d-left/twoL.vue +++ b/src/components/body-d-left/twoL.vue @@ -214,4 +214,4 @@ .ant-select-item-option-selected:not(.ant-select-item-option-disabled) { background-color: #002e64 !important; } - \ No newline at end of file + diff --git a/src/components/body-d-right/oneR.vue b/src/components/body-d-right/oneR.vue index 76e6521..ad38a65 100644 --- a/src/components/body-d-right/oneR.vue +++ b/src/components/body-d-right/oneR.vue @@ -158,11 +158,6 @@ } } - .dialog-con { - background-color: #00152b; - border: 1px solid #129bff; - } - .police-con { color: #ffffff; background-color: #00152b; @@ -184,4 +179,54 @@ } } } - \ No newline at end of file + + diff --git a/src/components/chinaMap/chinaMap.vue b/src/components/chinaMap/chinaMap.vue index 1b9c040..9787c4f 100644 --- a/src/components/chinaMap/chinaMap.vue +++ b/src/components/chinaMap/chinaMap.vue @@ -398,4 +398,4 @@ } } } - \ No newline at end of file + diff --git a/src/components/item-d/item-d.vue b/src/components/item-d/item-d.vue index c24051f..8f3e2be 100644 --- a/src/components/item-d/item-d.vue +++ b/src/components/item-d/item-d.vue @@ -1,15 +1,21 @@ + diff --git a/src/components/secondaryScreen/chinaMap/chinaMapApi.ts b/src/components/secondaryScreen/chinaMap/chinaMapApi.ts new file mode 100644 index 0000000..5f51cc7 --- /dev/null +++ b/src/components/secondaryScreen/chinaMap/chinaMapApi.ts @@ -0,0 +1,11 @@ +import { get } from '/@/api/request.ts'; + +export enum Api { + allList = '/health-emergency/emergency/tblAmbulanceGps/getAllList', + getAmbulanceList = '/health-emergency/emergency/tblAmbulanceGps/getAmbulanceList', +} + +// 获取所有资源 +export const getAllList = (params) => get(Api.allList, params); +//获取救护车GPS信息 +export const getAmbulanceList = (params) => get(Api.getAmbulanceList, params); \ No newline at end of file diff --git a/src/components/secondaryScreen/screen-right/oneR.vue b/src/components/secondaryScreen/screen-right/oneR.vue new file mode 100644 index 0000000..097b08f --- /dev/null +++ b/src/components/secondaryScreen/screen-right/oneR.vue @@ -0,0 +1,64 @@ + + + diff --git a/src/components/secondaryScreen/screen-right/screenRightHooks.ts b/src/components/secondaryScreen/screen-right/screenRightHooks.ts new file mode 100644 index 0000000..ac6cc25 --- /dev/null +++ b/src/components/secondaryScreen/screen-right/screenRightHooks.ts @@ -0,0 +1,119 @@ +import {computed, ref} from 'vue'; + +export function sleepCharts() { + return { + grid: { + top: '15%', + left: '8%', + right: '3%', + bottom: '18%', + }, + legend: { + data: ['清醒', '浅睡', '深睡'], + textStyle: { + color: '#ffffff' + }, + left: '60%', + }, + color: ['#14B3F8', '#6D7BEB', '#5451DC'], + xAxis: { + type: 'category', + axisLabel: { + color: '#ffffff' + }, + data: ['0', '2', '4', '6', '8', '10', '12', '14', '16', '18', '20', '22'], + }, + yAxis: { + type: 'value', + axisLabel: { + color: '#ffffff' + }, + axisLine: { + show: false + }, + splitLine: { + lineStyle: { + type: 'dashed', + color: '#696969' + } + } + }, + series: [ + { + name: '清醒', + type: 'bar', + data: [ + 2.0, 4.9, 7.0, 23.2, 25.6, 76.7, 135.6, 162.2, 32.6, 20.0, 6.4, 3.3 + ], + }, + { + name: '浅睡', + type: 'bar', + data: [ + 2.6, 5.9, 9.0, 26.4, 28.7, 70.7, 175.6, 182.2, 48.7, 18.8, 6.0, 2.3 + ], + }, + { + name: '深睡', + type: 'bar', + data: [ + 2.6, 5.9, 9.0, 26.4, 28.7, 70.7, 175.6, 182.2, 48.7, 18.8, 6.0, 2.3 + ], + } + ] + }; +} + +export function useHealth() { + const healthData = ref([ + { + name: '5000以下', + value: '0', + type: '1', + type_dictText: '恶性肿瘤', + }, + { + name: '5000~1w', + value: '2', + type: '2', + type_dictText: '其他', + }, + { + name: '1~1.5w', + value: '34', + type: '3', + type_dictText: '其他', + }, + { + name: '1.5w~2w', + value: '43', + type: '3', + type_dictText: '其他', + }, + { + name: '2以上', + value: '43', + type: '3', + type_dictText: '其他', + }, + ]); + const getValue = computed(() => healthData.value.map((item) => item.value)); + const getName = computed(() => healthData.value.map((item) => item.name)); + + function setHealth(data) { + data?.map((item1) => { + healthData.value.map((item2) => { + if (item1.type == item2.type) { + item2.value = item1.count; + } + }); + }); + } + + return { + healthData, + getValue, + getName, + setHealth, + }; +} \ No newline at end of file diff --git a/src/components/secondaryScreen/screen-right/threeR.vue b/src/components/secondaryScreen/screen-right/threeR.vue new file mode 100644 index 0000000..607ae97 --- /dev/null +++ b/src/components/secondaryScreen/screen-right/threeR.vue @@ -0,0 +1,71 @@ + + + diff --git a/src/components/secondaryScreen/screen-right/twoR.vue b/src/components/secondaryScreen/screen-right/twoR.vue new file mode 100644 index 0000000..35f52cb --- /dev/null +++ b/src/components/secondaryScreen/screen-right/twoR.vue @@ -0,0 +1,56 @@ + + + diff --git a/src/views/index.vue b/src/views/index.vue index 00d655f..e4e3c35 100644 --- a/src/views/index.vue +++ b/src/views/index.vue @@ -150,4 +150,4 @@ background: url('../assets/images/bottom-b.png') no-repeat; background-size: 100% 100%; } - \ No newline at end of file + diff --git a/src/views/indexSon.vue b/src/views/indexSon.vue index 571683d..008c639 100644 --- a/src/views/indexSon.vue +++ b/src/views/indexSon.vue @@ -14,8 +14,8 @@
-