diff --git a/src/components/body-d-right/oneR.vue b/src/components/body-d-right/oneR.vue index 107193a..814c593 100644 --- a/src/components/body-d-right/oneR.vue +++ b/src/components/body-d-right/oneR.vue @@ -91,6 +91,7 @@ import { useTheme } from '/@/hooks/theme/useTheme.ts'; import { message } from 'ant-design-vue'; import { Row, Col } from 'ant-design-vue'; + import dayjs from 'dayjs'; const props = defineProps({ setting: Object, @@ -140,9 +141,27 @@ * */ const scrollList = ref([]); + const interval = ref(null); + const nowDate = ref(dayjs()); + onMounted(() => { + interval.value = setInterval(() => { + if (dayjs(nowDate.value).diff(dayjs(), 'date') < 0) { + nowDate.value = dayjs(); + getScrollList(); + } + }, 1000); + }); + async function getScrollList() { + console.log(dayjs()); try { - const { code, result } = await getMonitorList({ pageSize: 10, pageNo: 1, orgCode: props.setting?.orgCode }); + const { code, result } = await getMonitorList({ + pageSize: 10, + pageNo: 1, + orgCode: props.setting?.orgCode, + startDate: dayjs().format('YYYY-MM-DD'), + endDate: dayjs().format('YYYY-MM-DD'), + }); if (code == 200) { setSession(RIGHT_KEY1, JSON.stringify(result.records)); scrollList.value = result.records; diff --git a/src/views/centralScreen/centralScreen.vue b/src/views/centralScreen/centralScreen.vue index e873bb4..8add11b 100644 --- a/src/views/centralScreen/centralScreen.vue +++ b/src/views/centralScreen/centralScreen.vue @@ -93,7 +93,7 @@ const dayTimeO = ref(); const dayTimeT = ref(); - const interval = ref(1); + const interval = ref(null); const title = ref(screenTitle ? screenTitle : '应急就医服务中心' + (simpleName || '')); const phone = ref(centerTel || '0951-6805199'); diff --git a/src/views/centralScreen/centralScreenD.vue b/src/views/centralScreen/centralScreenD.vue index a7faf1d..8951fb1 100644 --- a/src/views/centralScreen/centralScreenD.vue +++ b/src/views/centralScreen/centralScreenD.vue @@ -93,7 +93,7 @@ const dayTimeO = ref(); const dayTimeT = ref(); - const interval = ref(1); + const interval = ref(null); const title = ref(screenTitle ? screenTitle : '应急就医服务中心' + (simpleName || '')); const phone = ref(centerTel || '0951-6805199'); diff --git a/src/views/centralScreen/centralScreenYinChuan.vue b/src/views/centralScreen/centralScreenYinChuan.vue index 11fc194..80dd904 100644 --- a/src/views/centralScreen/centralScreenYinChuan.vue +++ b/src/views/centralScreen/centralScreenYinChuan.vue @@ -24,7 +24,6 @@ /> -
- - - + + + +
@@ -95,7 +95,7 @@ const dayTimeO = ref(); const dayTimeT = ref(); - const interval = ref(1); + const interval = ref(null); const title = ref(screenTitle ? screenTitle : '应急就医服务中心' + (simpleName || '')); const phone = ref(centerTel || '0951-6805199'); @@ -405,23 +405,33 @@ } .central-screen-body-left { - .service-details { + //.service-details { + // height: calc(100% / 3); + //} + // + //.daily-work-trends { + // height: calc(100% / 3); + //} + // + //.emergency-data { + // height: calc(100% / 3); + //} + > :nth-child(1) { + width: 100%; height: calc(100% / 3); + padding: 10px; } - - .daily-work-trends { - height: calc(100% / 3); - } - - .emergency-data { - height: calc(100% / 3); + > :nth-child(2) { + width: 100%; + height: calc(100% / 3 * 2); + padding: 10px; } } .body-d-right { > :nth-child(n) { width: 100%; - height: calc(100% / 3); + height: calc(100% / 2); padding: 10px; } } @@ -437,4 +447,8 @@ background: url('/@/assets/images/bottom-b.png') no-repeat; background-size: 100% 100%; } + + :deep(.inner .scroll) { + height: 100% !important; + } diff --git a/src/views/centralScreen/components/terminalAlarm.vue b/src/views/centralScreen/components/terminalAlarm.vue index 34a18b0..229420f 100644 --- a/src/views/centralScreen/components/terminalAlarm.vue +++ b/src/views/centralScreen/components/terminalAlarm.vue @@ -79,7 +79,7 @@