@@ -19,6 +19,8 @@
当月节省量：{{ monthlySavings }}kwh
-
+
@@ -16,8 +16,8 @@
{{
- item.label
- }}
+ item.label
+ }}
@@ -33,30 +33,34 @@
-
+ :close-on-click-modal="false" :close-on-press-escape="false">
-
-
+
{{ item.label }}
@@ -76,13 +80,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 {dateFormat} from "@/utils/date.js";
-import {getToken} from "@/utils/auth";
-import {useAuthStore} from "@/store/userstore.js";
-import {getLargeScreen, getLargeScreenInfo, getTunnelBySiteId} from "@/api/largeScreen";
-import {ElMessage, ElMessageBox} from "element-plus";
-import {getUserInfo} from "@/api/login";
-import {initSceneData} from "@/api/tunnelScene";
+import { dateFormat } from "@/utils/date.js";
+import { getToken } from "@/utils/auth";
+import { useAuthStore } from "@/store/userstore.js";
+import { getLargeScreen, getLargeScreenInfo, getTunnelBySiteId } from "@/api/largeScreen";
+import { ElMessage, ElMessageBox } from "element-plus";
+import { getUserInfo } from "@/api/login";
+import { initSceneData } from "@/api/tunnelScene";
const authStore = useAuthStore();
const router = useRouter();
const previewId = reactive(router.currentRoute.value.params.tunnelId)
@@ -154,7 +158,7 @@ const socketData = reactive({
sensor: [],
});
onMounted(() => {
- if(previewId){
+ if (previewId) {
getScreenInfo(previewId)
}
@@ -191,13 +195,13 @@ const getOtherInfo = () => {
currentSite.value = res.data.siteOption[0].label
localStorage.setItem('site', currentSite.value)
tunnelList.value = res.data.tunnelOption
- if(previewId){
+ if (previewId) {
tunnelList.value.forEach((item, index) => {
- if(item.value == previewId){
+ if (item.value == previewId) {
initialIndex.value = index
}
})
- }else{
+ } else {
getTunnel(res.data.siteOption[0].value)
}
}
@@ -208,33 +212,33 @@ const getScreenInfo = (id) => {
tunnelId.value = id
getLargeScreen(id).then((res) => {
if (res?.code === 1000) {
- if(res.data.frequencyChangerList.length!==0){
- showFanLoading.value=0
- }else {
- showFanLoading.value=1
+ if (res.data.frequencyChangerList.length !== 0) {
+ showFanLoading.value = 0
+ } else {
+ showFanLoading.value = 1
}
- if(res.data.windPressureSensorList.length!==0){
- showWindLoading.value=0
- }else {
- showWindLoading.value=1
+ if (res.data.windPressureSensorList.length !== 0) {
+ showWindLoading.value = 0
+ } else {
+ showWindLoading.value = 1
}
- if(res.data.sensorList.length!==0){
- res.data.sensorList.forEach((item,index)=>{
+ if (res.data.sensorList.length !== 0) {
+ res.data.sensorList.forEach((item, index) => {
if (
- item.equipmentType === "carbonDioxide" ||
- item.equipmentType === "carbonMonoxide" ||
- item.equipmentType === "hydrogenSulfide" ||
- item.equipmentType === "sulfurDioxide" ||
- item.equipmentType === "sulfurMonoxide" ||
- item.equipmentType === "nitrogenDioxide"
+ item.equipmentType === "carbonDioxide" ||
+ item.equipmentType === "carbonMonoxide" ||
+ item.equipmentType === "hydrogenSulfide" ||
+ item.equipmentType === "sulfurDioxide" ||
+ item.equipmentType === "sulfurMonoxide" ||
+ item.equipmentType === "nitrogenDioxide"
) {
- showBadLoading.value=0
- }else {
- showBadLoading.value=1
+ showBadLoading.value = 0
+ } else {
+ showBadLoading.value = 1
}
})
- }else {
- showBadLoading.value=1
+ } else {
+ showBadLoading.value = 1
}
largeScreenData.value = res.data;
} else {
@@ -262,9 +266,9 @@ const changeTunnel = (e) => {
newObj = item
}
})
- showBadLoading.value=0
- showWindLoading.value=0
- showFanLoading.value=0
+ showBadLoading.value = 0
+ showWindLoading.value = 0
+ showFanLoading.value = 0
getScreenInfo(newObj.value)
nextTick(() => {
showFan.value = true;
@@ -358,6 +362,9 @@ const initWebSocket = () => {
}, 30000);
};
initWebSocket();
+
+let tunnelLen = computed(() => tunnelLength);
+
diff --git a/src/components/content/tunnelScene/sceneClass/previewTunnelInit/index.js b/src/components/content/tunnelScene/sceneClass/previewTunnelInit/index.js
index 7103d7d..59b98c4 100644
--- a/src/components/content/tunnelScene/sceneClass/previewTunnelInit/index.js
+++ b/src/components/content/tunnelScene/sceneClass/previewTunnelInit/index.js
@@ -10,7 +10,7 @@ export default function previewtunnelModeInit(equipmentList) {
// this.scene.getObjectByName(wall).visible = false
// }
// }
- console.log(equipmentList);
+ // console.log(equipmentList);
equipmentList.forEach((item) => {
this.addEquipment(this.scene.getObjectByName(item.position), item);
@@ -26,4 +26,4 @@ export default function previewtunnelModeInit(equipmentList) {
}
})
}
-}
\ No newline at end of file
+}
diff --git a/src/components/content/usedEle/UsedEle.vue b/src/components/content/usedEle/UsedEle.vue
index 10de6ca..00157a2 100644
--- a/src/components/content/usedEle/UsedEle.vue
+++ b/src/components/content/usedEle/UsedEle.vue
@@ -1,5 +1,5 @@
-
-
+
+
+
@@ -39,7 +41,7 @@
-
+
加载中...
@@ -56,6 +58,7 @@
@@ -613,12 +439,12 @@ getList()
.device-content {
display: flex;
justify-content: center;
- padding-top: 220px;
+ padding-top: 190px;
.device-box {
display: flex;
width: 2194px;
- height: 1500px;
+ height: 1600px;
background: #064B66;
border-radius: 20px;
border: 2px solid #05FEFF;
@@ -627,7 +453,7 @@ getList()
.box-left {
padding-left: 24px;
width: 300px;
- height: 1498px;
+ height: 1596px;
background: #0D5A7A;
border-radius: 20px 0px 0px 20px;
@@ -683,36 +509,39 @@ getList()
}
.collection-frequency {
+ height: 60px;
+ display: flex;
+ align-items: center;
position: absolute;
right: 102px;
> span:first-child {
font-size: 38px !important;
+ white-space: pre;
+ margin-right: 15px;
}
- .units {
- position: relative;
+ :deep(.el-input__wrapper) {
+ width: 166px;
+ height: 56px;
+ background-color: transparent;
+ box-shadow: none;
+ border-radius: 6px;
+ border: 1px solid #05FEFF;
+ transform: none;
+ transition: none;
- input {
- width: 220px;
- height: 50px;
- border: 1px solid #05FEFF;
- background: transparent;
- margin-left: 14px;
- font-size: 35px;
+ .el-input__inner {
+ height: 54px;
+ font-size: 30px;
color: #FFFFFF;
- outline: none;
}
- }
- .units::after {
- content: "秒/次";
- position: absolute;
- right: 6px;
- top: 26%;
- transform: translateY(-50%);
- font-size: 35px;
- color: #08B7B8;
+ .el-input__suffix-inner {
+ font-size: 30px;
+ color: #08B7B8;
+ line-height: 40px;
+ }
}
}
}
diff --git a/src/views/login/index.vue b/src/views/login/index.vue
index 3ced737..804a9a2 100644
--- a/src/views/login/index.vue
+++ b/src/views/login/index.vue
@@ -115,7 +115,7 @@ onBeforeUnmount(() => {
.login-box {
height: 100%;
- background-color: #4158d0;
+ background-color: #063247;
//background-image: linear-gradient(
// 43deg,
// #4158d0 0%,
diff --git a/src/views/tunnel/index.vue b/src/views/tunnel/index.vue
index 7128a52..4c7ae8c 100644
--- a/src/views/tunnel/index.vue
+++ b/src/views/tunnel/index.vue
@@ -325,7 +325,6 @@ const nextBtn = () => {
const initWebSocket = () => {
// let wsUrl = `ws://192.168.31.175:9000/websocket/equipment/${token}/${serialNumber.value}`
let wsUrl = `ws://web-tunnel.feashow.com/api/wstunnel/websocket/equipment/${token}/${serialNumber.value}`;
- console.log(wsUrl);
socket = new WebSocket(wsUrl);
//连接发生错误的回调方法
socket.onerror = function () {
From e5e7ed34127ef1b0e86a2f6ea7e1bbefa3930dc3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=82=93=E6=B4=81?= <209192278@qq.com>
Date: Wed, 17 Jan 2024 15:19:29 +0800
Subject: [PATCH 17/34] =?UTF-8?q?=E9=82=93=E6=B4=81:=20=E6=B3=A8=E9=87=8Al?=
=?UTF-8?q?og?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/views/tunnel/index.vue | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/views/tunnel/index.vue b/src/views/tunnel/index.vue
index 4c7ae8c..f9ea77f 100644
--- a/src/views/tunnel/index.vue
+++ b/src/views/tunnel/index.vue
@@ -336,7 +336,7 @@ const initWebSocket = () => {
};
//接收到消息的回调方法
socket.onmessage = function (event) {
- console.log("服务器返回的信息: ", JSON.parse(event.data));
+ // console.log("服务器返回的信息: ", JSON.parse(event.data));
const type = JSON.parse(event.data).type;
const data = JSON.parse(event.data).data;
if (type === "equipment") {
From 2fce431c4321c3d7875a3a3c93febf40d47adfbb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=82=93=E6=B4=81?= <209192278@qq.com>
Date: Wed, 17 Jan 2024 16:08:06 +0800
Subject: [PATCH 18/34] =?UTF-8?q?=E9=82=93=E6=B4=81:=20=E5=88=86=E6=B5=81?=
=?UTF-8?q?=E9=98=80=E5=80=BC=E6=A0=B7=E5=BC=8F=E5=8F=8A=E8=AE=BE=E5=A4=87?=
=?UTF-8?q?=E6=8E=A5=E5=8F=A3=E5=AF=B9=E6=8E=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/components/content/fanInfo/FanInfo.vue | 176 +++++++++++++--------
src/views/device-manage/index.vue | 12 +-
src/views/tunnel/index.vue | 2 +-
3 files changed, 113 insertions(+), 77 deletions(-)
diff --git a/src/components/content/fanInfo/FanInfo.vue b/src/components/content/fanInfo/FanInfo.vue
index b2538ec..5268939 100644
--- a/src/components/content/fanInfo/FanInfo.vue
+++ b/src/components/content/fanInfo/FanInfo.vue
@@ -56,21 +56,24 @@
-
- 分流阀值
-
-
+
+
+ {{ index + 1 }}号分流阀值
+
+