diff --git a/src/components/content/airInfo/AirInfo.vue b/src/components/content/airInfo/AirInfo.vue index 6b6c697..5af5e27 100644 --- a/src/components/content/airInfo/AirInfo.vue +++ b/src/components/content/airInfo/AirInfo.vue @@ -241,8 +241,8 @@ const getChartInfo = (equipmentId, type = 'day', time = '', flag, startTime, end nextTick(() => { if (flag) { const fan = document.getElementById('airDialog') - fan.classList.remove('shrink-screen-dialog') - if (!isFullScreen.value) { + fan.classList.add('shrink-screen-dialog') + if (isFullScreen.value) { const titleName = document.getElementsByClassName('el-dialog__title')[0] titleName.style.fontSize = '70px' } @@ -260,8 +260,8 @@ const getChartInfo = (equipmentId, type = 'day', time = '', flag, startTime, end fanChart.style.height = element.offsetHeight - 140 + 'px' myEcharts.resize(); }); - if (!isFullScreen.value) { - initChart(res.data.dates, res.data.values, '93%') + if (isFullScreen.value) { + initChart(res.data.dates, res.data.values, dataZoomTop) } } else { shrinkScreen() @@ -288,7 +288,7 @@ const handleOpenChart = (id, type) => { chooseDayRef.value.clearData() } }) - isFullScreen.value = false + isFullScreen.value = true if (type === 'air') { dialogTitle.value = id.name openDialogId.value = id.equipmentId diff --git a/src/components/content/badGasInfo/BadGasInfo.vue b/src/components/content/badGasInfo/BadGasInfo.vue index 2645a39..c0e20b8 100644 --- a/src/components/content/badGasInfo/BadGasInfo.vue +++ b/src/components/content/badGasInfo/BadGasInfo.vue @@ -281,8 +281,8 @@ const getBadGasChartInfo = (type, time = '', flag, startTime, endTime) => { nextTick(() => { if (flag) { const fan = document.getElementById('badDialog') - fan.classList.remove('shrink-screen-dialog') - if (!isFullScreen.value) { + fan.classList.add('shrink-screen-dialog') + if (isFullScreen.value) { const titleName = document.getElementsByClassName('el-dialog__title')[0] titleName.style.fontSize = '70px' } @@ -300,8 +300,8 @@ const getBadGasChartInfo = (type, time = '', flag, startTime, endTime) => { fanChart.style.height = element.offsetHeight - 140 + 'px' myEcharts.resize(); }); - if (!isFullScreen.value) { - initChart(res.data.dates, res.data, '93%') + if (isFullScreen.value) { + initChart(res.data.dates, res.data, dataZoomTop) } } else { shrinkScreen() @@ -322,7 +322,7 @@ const handleOpenChart = () => { } }) isBadGasVisited.value = true - isFullScreen.value = false + isFullScreen.value = true getBadGasChartInfo('day', '', true) }; const getImageUrl = (name) => { diff --git a/src/components/content/fanInfo/FanInfo.vue b/src/components/content/fanInfo/FanInfo.vue index 5aaafb2..2f88969 100644 --- a/src/components/content/fanInfo/FanInfo.vue +++ b/src/components/content/fanInfo/FanInfo.vue @@ -425,8 +425,8 @@ const getFanInfo = (equipmentId, type = 'day', time = '', flag, startTime, endTi nextTick(() => { if (flag) { const fan = document.getElementById('fanDialog') - fan.classList.remove('shrink-screen-dialog') - if (!isFullScreen.value) { + fan.classList.add('shrink-screen-dialog') + if (isFullScreen.value) { const titleName = document.getElementsByClassName('el-dialog__title')[0] titleName.style.fontSize = '70px' } @@ -444,8 +444,8 @@ const getFanInfo = (equipmentId, type = 'day', time = '', flag, startTime, endTi fanChart.style.height = element.offsetHeight - 140 + 'px' myEcharts.resize(); }); - if (!isFullScreen.value) { - initChart(res.data.dates, res.data.currentsA, res.data.currentsB, res.data.currentsC, '93%') + if (isFullScreen.value) { + initChart(res.data.dates, res.data.currentsA, res.data.currentsB, res.data.currentsC, dataZoomTop) } } else { shrinkScreen() @@ -471,7 +471,7 @@ const handleOpenChart = (item) => { isVisited.value = true selectTimeButton.value = 2 openEquipmentId.value = item.equipmentId - isFullScreen.value = false + isFullScreen.value = true getFanInfo(item.equipmentId, 'day', '', true) if (item.equipmentType === "frequency1") { fanIndex.value = 'δΈ€' diff --git a/src/components/content/usedEle/UsedEle.vue b/src/components/content/usedEle/UsedEle.vue index f0a02f1..e8298c5 100644 --- a/src/components/content/usedEle/UsedEle.vue +++ b/src/components/content/usedEle/UsedEle.vue @@ -292,8 +292,8 @@ const getFanInfo = (equipmentId, type = 'month', time = '', flag) => { nextTick(() => { if (flag) { const fan = document.getElementById('eleDialog') - fan.classList.remove('shrink-screen-dialog') - if (!isFullScreen.value) { + fan.classList.add('shrink-screen-dialog') + if (isFullScreen.value) { const titleName = document.getElementsByClassName('el-dialog__title')[0] titleName.style.fontSize = '70px' } @@ -313,8 +313,8 @@ const getFanInfo = (equipmentId, type = 'month', time = '', flag) => { fanChart.style.height = element.offsetHeight - 280 + 'px' myEcharts.resize(); }); - if (!isFullScreen.value) { - initChart(res.data.dates, res.data.consumptionValues, res.data.saveElectricityValues, '94%') + if (isFullScreen.value) { + initChart(res.data.dates, res.data.consumptionValues, res.data.saveElectricityValues, dataZoomTop) } } else { shrinkScreen() @@ -337,7 +337,7 @@ const handleOpenChart = () => { chooseMonthRef.value.clearData() } }) - isFullScreen.value = false + isFullScreen.value = true getFanInfo(openEquipmentId.value, 'month', '', true) } /** diff --git a/src/components/content/windPressure/WindPressureList.vue b/src/components/content/windPressure/WindPressureList.vue index 3c8a175..b8272c2 100644 --- a/src/components/content/windPressure/WindPressureList.vue +++ b/src/components/content/windPressure/WindPressureList.vue @@ -194,8 +194,8 @@ const getWindInfo = (equipmentId, type = 'day', time = '', flag, startTime, endT nextTick(() => { if (flag) { const fan = document.getElementById('windDialog') - fan.classList.remove('shrink-screen-dialog') - if (!isFullScreen.value) { + fan.classList.add('shrink-screen-dialog') + if (isFullScreen.value) { const titleName = document.getElementsByClassName('el-dialog__title')[0] titleName.style.fontSize = '70px' } @@ -213,8 +213,8 @@ const getWindInfo = (equipmentId, type = 'day', time = '', flag, startTime, endT fanChart.style.height = element.offsetHeight - 140 + 'px' myEcharts.resize(); }); - if (!isFullScreen.value) { - initChart(res.data.dates, res.data.values, '93%') + if (isFullScreen.value) { + initChart(res.data.dates, res.data.values, dataZoomTop) } } else { shrinkScreen() @@ -241,7 +241,7 @@ const handleOpenChart = (item) => { chooseDayRef.value.clearData() } }) - isFullScreen.value = false + isFullScreen.value = true getWindInfo(item.equipmentId, 'day', '', true) windSort.value = item.equipmentName windSortId.value = item.equipmentId diff --git a/src/views/login/index.vue b/src/views/login/index.vue index 93d5ade..9cfb2d2 100644 --- a/src/views/login/index.vue +++ b/src/views/login/index.vue @@ -46,7 +46,7 @@ const router = useRouter(); const authStore = useAuthStore(); const loginForm = reactive({ // username: "admin", - password: "123456", + password: "", username: "administrator", // password: "", code: "",