odjbin/tunnel-cloud-web
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request 'dev' (#353) from dev into master

Browse Source 
Reviewed-on: http://git.feashow.cn/clay/tunnel-cloud-web/pulls/353
This commit is contained in:
odjbin
2024-08-06 14:06:08 +00:00
parent 5521f7db7a 7d318d2d0c
commit 23c82eafaf
8 changed files with 28 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
.drone.yml
View File

@@ -85,6 +85,7 @@ volumes:
host:
path: /var/run/docker.sock
# 定义触发条件
trigger:
branch:
- dev

10
src/components/content/airInfo/AirInfo.vue
View File

@@ -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

10
src/components/content/badGasInfo/BadGasInfo.vue
View File

@@ -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) => {

10
src/components/content/fanInfo/FanInfo.vue
View File

@@ -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 = '一'

10
src/components/content/usedEle/UsedEle.vue
View File

@@ -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)
}
/**

10
src/components/content/windPressure/WindPressureList.vue
View File

@@ -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

1
src/components/tunnelTitle/index.vue
View File

@@ -2,6 +2,7 @@
<div class="tunnel-title">
<span>{{ currentSite }}地下复杂洞群智能通风控制系统</span>
</div>
</template>
<script setup>

2
src/views/login/index.vue
View File

@@ -46,7 +46,7 @@ const router = useRouter();
const authStore = useAuthStore();
const loginForm = reactive({
// username: "admin",
password: "123456",
password: "",
username: "administrator",
// password: "",
code: "",