邓洁 : 合并代码

This commit is contained in:
邓洁
2023-12-13 10:20:10 +08:00
parent 5243d89213
commit 6de7384566

View File

@@ -1,8 +1,9 @@
<template>
<div>
<div class="box-top">
<manage-btn v-model="selectIndex" @select="manageSelect" />
<manage-btn v-model="selectIndex" @select="manageSelect"/>
<div class="tunnel-title"></div>
<manage-length class="tunnel-length"></manage-length>
<div class="top-right">
<div class="current-site">
当前站点<span>{{ currentSite }}</span>
@@ -15,19 +16,19 @@
</div>
</div>
</div>
<tunnel-scene id="tunnel-box" />
<tunnel-scene id="tunnel-box"/>
<div class="left">
<el-drawer v-model="drawerLeft" direction="ltr" modal-class="modal-box" :modal="false" :show-close="false"
:close-on-click-modal="false" :close-on-press-escape="false">
<fan-info v-if="showFan" :list="socketData.frequencyState" />
<transducer-list :list="socketData.currentVoltage" :feedback="socketData.frequencyFeedback" />
<used-ele :list="socketData.electricityConsumption" />
:close-on-click-modal="false" :close-on-press-escape="false">
<fan-info v-if="showFan" :list="socketData.frequencyState"/>
<transducer-list :list="socketData.currentVoltage" :feedback="socketData.frequencyFeedback"/>
<used-ele :list="socketData.electricityConsumption"/>
</el-drawer>
<div v-if="drawerLeft" class="left-arrow" @click="closeLeft"></div>
<div v-else class="shrink-left" @click="closeLeft"></div>
</div>
<div class="right">
<el-drawer
<el-drawer
v-model="drawerRight"
direction="rtl"
modal-class="modal-box"
@@ -42,7 +43,7 @@
</el-drawer>
<div v-if="drawerRight" class="right-arrow" @click="closeRight"></div>
<div v-else class="shrink-right" @click="closeRight"></div>
</div>
</div>
<div class="switch-btn">
<div class="arrow" @click="previousBtn"></div>
<el-carousel height="150px" type="card" ref="tunnelBtn" :autoplay="false">
@@ -68,11 +69,13 @@ import WindPressureList from "@/components/content/windPressure/WindPressureList
import AirInfo from "@/components/content/airInfo/AirInfo.vue";
import BadGasInfo from "@/components/content/badGasInfo/BadGasInfo.vue";
import ManageBtn from "@/components/manageBtn/index.vue";
import ManageLength from "@/components/manageLength/index.vue";
import {dateFormat} from "@/utils/date.js";
import {onMounted} from "vue";
import {getToken} from "@/utils/auth";
import {useAuthStore} from '@/store/userstore.js'
import {getLargeScreen} from "@/api/largeScreen";
const authStore = useAuthStore()
const router = useRouter()
const selectIndex = ref(1)
@@ -102,10 +105,7 @@ const tunnelList = ref([
}, {
value: 5,
name: '六号隧道'
}, {
value: 6,
name: '七号隧道'
},
}
])
let socket = reactive('')
const serialNumber = ref('SC00DY00GH00ELBT')
@@ -113,7 +113,7 @@ let token = getToken();
let send = {
type: "ping"
}
const largeScreenData=ref(null)
const largeScreenData = ref(null)
const socketData = reactive({
currentVoltage: [],
frequencyState: [],
@@ -131,9 +131,9 @@ onMounted(() => {
})
const getScreenInfo = async () => {
await getLargeScreen(1).then(res=>{
if(res?.code === 1000) {
largeScreenData.value=res.data
await getLargeScreen(1).then(res => {
if (res?.code === 1000) {
largeScreenData.value = res.data
}
})
}
@@ -196,7 +196,7 @@ const initWebSocket = () => {
} else if (item.typeKey === 'windPressure') {
console.log('风压风压')
socketData.windPressure = data
}else if (item.typeKey === 'sensor') {
} else if (item.typeKey === 'sensor') {
console.log('传感器==========?')
socketData.sensor = data
}