diff --git a/src/components/form/datePicker/index.vue b/src/components/form/datePicker/index.vue index 6600299..923673c 100644 --- a/src/components/form/datePicker/index.vue +++ b/src/components/form/datePicker/index.vue @@ -391,18 +391,24 @@ const next = () => { if (year >= presentY && !props.nextFlag) { startTime = presentY + '-01-01' if (presentM < 10) { + if (presentD < 10) { endTime = presentY + '-0' + presentM + '-0' + presentD } else { endTime = presentY + '-0' + presentM + '-' + presentD } } else { - endTime = presentY + '-' + presentM + '-' + presentD + if (presentD < 10) { + endTime = presentY + '-' + presentM + '-0' + presentD + } else { + endTime = presentY + '-' + presentM + '-' + presentD + } } } else { startTime = year + '-01-01' endTime = year + '-12-31' } + } timeValue.value = [startTime, endTime] diff --git a/src/styles/element.scss b/src/styles/element.scss index 15d85c5..0a4e7cb 100644 --- a/src/styles/element.scss +++ b/src/styles/element.scss @@ -152,7 +152,6 @@ } } - .el-tabs__content { height: calc(100% - 40px); .el-tab-pane { @@ -214,11 +213,16 @@ margin-bottom: 0 !important; } //tabs 添加icon样式 -.custom-tabs-label{ +.custom-tabs-label { display: flex; align-items: center; justify-content: space-between; .el-icon { margin-right: 5px; } -} \ No newline at end of file +} +.el-pagination__sizes { + .el-select { + min-width: 128px; + } +} diff --git a/src/utils/echartMethod.ts b/src/utils/echartMethod.ts index ce1861b..367c655 100644 --- a/src/utils/echartMethod.ts +++ b/src/utils/echartMethod.ts @@ -1,7 +1,6 @@ import { install$2 } from 'echarts/types/dist/shared' export const yMethod = (arr: any) => { - console.log('🚀 ~ yMethod ~ arr:', arr) let interval = 0 let maxValue = 0 let minValue = 0 @@ -10,33 +9,6 @@ export const yMethod = (arr: any) => { maxValue = Math.max(...arr) minValue = Math.min(...arr) - console.log('🚀 ~ yMethod ~ minValue:', minValue,maxValue) - - // interval = (maxValue - minValue) / 4 - // if (maxValue > 1000) { - // interval = (Math.ceil(maxValue / 100) * 100 - Math.ceil(minValue / 100) * 100) / 4 - // min = Math.floor((minValue - interval / 2) / 100) * 100 - // max = Math.ceil((maxValue + interval / 2) / 100) * 100 - // min >= 0 ? 0 : '' - // } else { - // min = Math.floor(minValue - interval / 2) - // max = Math.ceil(maxValue + interval / 2) - // console.log('🚀 ~ yMethod ~ minValue:', minValue) - - // if (minValue >= 0 && minValue < 10) { - // min = 0 - // } - // if (maxValue < 1 && maxValue >= 0) { - // max = 1 - // } - // interval = (max - min) / 4 - // } - - // if (interval < 1 && interval > -1) { - // interval = 1 - // } - // console.log("🚀 ~ yMethod ~ minValue:", minValue) - if (maxValue > 1000) { max = Math.ceil(maxValue / 100) * 100 min = (Math.floor(minValue / 100) - 1) * 100 @@ -44,12 +16,12 @@ export const yMethod = (arr: any) => { max = Math.ceil(maxValue / 10) * 10 min = Math.floor(minValue / 10) * 10 } - if (max > 0 && max < 1) { + + if (maxValue > 0 && maxValue < 1) { max = 1 - } - // if (min < 0 && min < -1) { - // min = -1 - // } + } else if (max == 0 && minValue > -1 && minValue < 0) { + min = -1 + } return [min, max, interval] } diff --git a/src/views/govern/alarm/Device.vue b/src/views/govern/alarm/Device.vue index 791d7a6..265359f 100644 --- a/src/views/govern/alarm/Device.vue +++ b/src/views/govern/alarm/Device.vue @@ -2,25 +2,15 @@ @@ -70,7 +60,7 @@ const rankOptions = ref([ ]) const tableStore = new TableStore({ - url: '/cs-harmonic-boot/eventUser/queryEventpage', + url: '/cs-harmonic-boot/eventUser/queryEventpageWeb', method: 'POST', publicHeight: 65, column: [ @@ -82,9 +72,7 @@ const tableStore = new TableStore({ { title: '发生时刻', field: 'startTime', align: 'center' } ], beforeSearchFun: () => { - if (!tableStore.table.params.deviceId) { - delete tableStore.table.params.deviceId - } + } }) @@ -102,6 +90,7 @@ tableStore.table.params.eventIds = [] tableStore.table.params.status = '' tableStore.table.params.target = [] tableStore.table.params.userId = '' +tableStore.table.params.deviceTypeId = '' const deviceTreeOptions = ref(props.deviceTree) deviceTreeOptions.value.map((item: any, index: any) => { @@ -110,21 +99,24 @@ deviceTreeOptions.value.map((item: any, index: any) => { } }) const sourceChange = (e: any) => { - tableStore.table.params.engineeringid = e[1] || '' - tableStore.table.params.projectId = e[2] || '' - const zlIndex = deviceTreeOptions.value.findIndex((item: any) => { - return item.name == '治理设备' - }) - const bxsIndex = deviceTreeOptions.value.findIndex((item: any) => { - return item.name == '便携式设备' - }) - //便携式设备特殊处理 - if (bxsIndex != -1 && deviceTreeOptions.value[bxsIndex].id == e[0] && e.length == 2) { - tableStore.table.params.deviceId = e[1] - } - //治理设备 - if (zlIndex != -1 && deviceTreeOptions.value[zlIndex].id == e[0]) { - tableStore.table.params.deviceId = e[2] || '' + tableStore.table.params.deviceTypeId = '' + tableStore.table.params.engineeringid = '' + tableStore.table.params.projectId = '' + tableStore.table.params.deviceId = '' + if (e) { + let name = deviceTreeOptions.value.filter((item: any) => { + return item.id == e[0] + })[0].name + + if (name == '便携式设备') { + tableStore.table.params.deviceTypeId = e[0] || '' + tableStore.table.params.deviceId = e[1] || '' + } else { + tableStore.table.params.deviceTypeId = e[0] || '' + tableStore.table.params.engineeringid = e[1] || '' + tableStore.table.params.projectId = e[2] || '' + + } } } @@ -134,6 +126,6 @@ onMounted(() => { setTimeout(() => { // tableStore.table.height = mainHeight(200).height as any }, 0) -const addMenu = () => {} +const addMenu = () => { } diff --git a/src/views/govern/alarm/Steady.vue b/src/views/govern/alarm/Steady.vue index 005a1b7..5171496 100644 --- a/src/views/govern/alarm/Steady.vue +++ b/src/views/govern/alarm/Steady.vue @@ -2,15 +2,9 @@