@@ -588,7 +588,8 @@ const getTunnel = (id) => {
}
});
} else {
- tunnelList.value = res.data;
+ console.info("🚀 ~method: tunnelList.value -----", tunnelList.value)
+ // tunnelList.value = res.data;
getScreenInfo(res.data[0]?.value);
}
}
@@ -596,16 +597,18 @@ const getTunnel = (id) => {
});
};
const changeTunnel = (e) => {
- console.info("🚀 ~method:'socket' -----", socket)
+ // console.info("🚀 ~method:'tunnelList.value' -----", tunnelList.value)
+ // console.info("🚀 ~method:'changeTunnel' -----", e)
if(socket){
socket.close()
}
let newObj = {}
tunnelList.value.forEach((item, index) => {
- if (index === e) {
+ if (index == e) {
newObj = item;
}
});
+ // console.info("🚀 ~method:changeTunnel -----", newObj)
showFan.value = false;
showBadLoading.value = 0;
showWindLoading.value = 0;
From 6dcbd23ef47c1374a1b34d55d75bb23d60725801 Mon Sep 17 00:00:00 2001
From: odjbin <1042039504@qq.com>
Date: Wed, 18 Sep 2024 19:52:38 +0800
Subject: [PATCH 12/13] =?UTF-8?q?fix=20:=20=E4=BF=AE=E5=A4=8D=E9=9A=A7?=
=?UTF-8?q?=E9=81=93=E7=BC=96=E8=BE=91bug,=E6=B3=A8=E9=87=8Alog?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../content/tunnelScene/PreviewScene.vue | 2 +-
.../content/tunnelScene/TunnelScene.vue | 2 +-
src/store/modelSceneStore.js | 22 +++++++++++++++++++
src/views/debug/index.vue | 4 ++--
src/views/device-manage/index.vue | 6 ++---
src/views/tunnel-manage/index.vue | 2 +-
src/views/tunnel-simulate/index.vue | 4 ++--
src/views/tunnel-simulate/tunnel-list.vue | 2 +-
src/views/tunnel/index.vue | 6 ++---
9 files changed, 36 insertions(+), 14 deletions(-)
diff --git a/src/components/content/tunnelScene/PreviewScene.vue b/src/components/content/tunnelScene/PreviewScene.vue
index 9baf72f..ec25897 100644
--- a/src/components/content/tunnelScene/PreviewScene.vue
+++ b/src/components/content/tunnelScene/PreviewScene.vue
@@ -382,7 +382,7 @@ function loadModel(path) {
(xhr) => {
//这里可以拿到加载的进度条！！！
// console.log(xhr);
- console.log((xhr.loaded / xhr.total) * 100 + "% loaded");
+ // console.log((xhr.loaded / xhr.total) * 100 + "% loaded");
},
(err) => {
reject(err);
diff --git a/src/components/content/tunnelScene/TunnelScene.vue b/src/components/content/tunnelScene/TunnelScene.vue
index b95371a..3bfa10c 100644
--- a/src/components/content/tunnelScene/TunnelScene.vue
+++ b/src/components/content/tunnelScene/TunnelScene.vue
@@ -137,7 +137,7 @@ async function handleMounted() {
params.form
);
// modelList.value = await initData(params.tunnelId, params.form);
- console.log("test", modelList.value);
+ // console.log("test", modelList.value);
demo.editTunnelInit(toRaw(modelList.value));
demo.SignsInf(params.form.tunnelAlias, String(params.tunnelLength));
} catch (err) {
diff --git a/src/store/modelSceneStore.js b/src/store/modelSceneStore.js
index e9ee3fa..9999244 100644
--- a/src/store/modelSceneStore.js
+++ b/src/store/modelSceneStore.js
@@ -4,13 +4,23 @@ import { apiSaveEquipment, initSceneData } from "../api/tunnelScene";
export const useModelSceneStore = defineStore("modelSceneData", () => {
let equipmentList = ref([]);
+ let tunnelGatewayDtoList = ref([]);
+ let serialNumber = ref("");
+ let tunnelAlias = ref("");
+ let serialNumberPrefix = ref("");
let requestOtherConfig = ref({});
function initModelData(tunnelId, otherConfig) {
return new Promise((resolve, reject) => {
+ console.info("🚀 ~method:otherConfig -----", otherConfig)
+ tunnelAlias.value=otherConfig.tunnelAlias
handleSettingOtherConfig(otherConfig, requestOtherConfig);
initSceneData(tunnelId)
.then((res) => {
+ console.info("🚀 ~method:res -----", res)
+ serialNumber.value=res.data.serialNumber
+ serialNumberPrefix.value=res.data.serialNumberPrefix
+ tunnelGatewayDtoList.value=res.data.tunnelGatewayVoList
if (res.data.tunnelThreeConfig) {
equipmentList.value = JSON.parse(res.data.tunnelThreeConfig);
} else {
@@ -34,6 +44,10 @@ export const useModelSceneStore = defineStore("modelSceneData", () => {
return new Promise((resolve, reject) => {
initSceneData(tunnelId)
.then((res) => {
+ console.info("🚀 ~method:initSceneData -----", res)
+ serialNumber.value=res.data.serialNumber
+ serialNumberPrefix.value=res.data.serialNumberPrefix
+ tunnelGatewayDtoList.value=res.data.tunnelGatewayVoList
if (res.data.tunnelThreeConfig) {
equipmentList.value = JSON.parse(res.data.tunnelThreeConfig);
} else {
@@ -61,6 +75,10 @@ export const useModelSceneStore = defineStore("modelSceneData", () => {
pointGap
),
modelEquipmentList: toRaw(equipmentList.value),
+ serialNumber:serialNumber.value,
+ tunnelAlias:tunnelAlias.value,
+ serialNumberPrefix:serialNumberPrefix.value,
+ tunnelGatewayDtoList:tunnelGatewayDtoList.value,
...requestOtherConfig,
})
.then((res) => {
@@ -91,6 +109,10 @@ export const useModelSceneStore = defineStore("modelSceneData", () => {
pointGap
),
modelEquipmentList: toRaw(equipmentList.value),
+ serialNumber:serialNumber.value,
+ tunnelAlias:tunnelAlias.value,
+ serialNumberPrefix:serialNumberPrefix.value,
+ tunnelGatewayDtoList:tunnelGatewayDtoList.value,
...requestOtherConfig,
})
.then((res) => {
diff --git a/src/views/debug/index.vue b/src/views/debug/index.vue
index 6e008f1..e737004 100644
--- a/src/views/debug/index.vue
+++ b/src/views/debug/index.vue
@@ -85,12 +85,12 @@ const initWebSocket = () => {
};
//连接成功建立的回调方法
socket.onopen = function () {
- console.log("ws连接成功");
+ // console.log("ws连接成功");
}
//接收到消息的回调方法
socket.onmessage = function (event) {
dataList.value.push(JSON.parse(event.data))
- console.log("服务器返回的信息: ", JSON.parse(event.data));
+ // console.log("服务器返回的信息: ", JSON.parse(event.data));
}
//连接关闭的回调方法
socket.onclose = function () {
diff --git a/src/views/device-manage/index.vue b/src/views/device-manage/index.vue
index ef05118..375c274 100644
--- a/src/views/device-manage/index.vue
+++ b/src/views/device-manage/index.vue
@@ -394,10 +394,10 @@ const clearWinDataSelectedOption=()=>{
winDataSelectedOption.value=[]
}
const changeWindDataSerialNumber = (value,options) => {
- console.info("🚀 ~method:changeWindDataSerialNumber -----", value,options)
+ // console.info("🚀 ~method:changeWindDataSerialNumber -----", value,options)
options?.forEach(item=>{
if(item.value==value){
- console.info("🚀 ~method:item.label -----", item.label)
+ // console.info("🚀 ~method:item.label -----", item.label)
if(item.label.indexOf('PLC')>=0){
winDataSelectedOption.value=[]
}else{
@@ -469,7 +469,7 @@ const editEquip = debounce(() => {
sensorList: newSensor,
// shuntList: editFenLiuData.value,
}
- console.info("🚀 ~ file:index method: line:478 -----",basicData)
+ // console.info("🚀 ~ file:index method: line:478 -----",basicData)
editEquipment(basicData).then(res => {
if (res.code === 1000) {
loading.close()
diff --git a/src/views/tunnel-manage/index.vue b/src/views/tunnel-manage/index.vue
index 8561e32..f9e70e5 100644
--- a/src/views/tunnel-manage/index.vue
+++ b/src/views/tunnel-manage/index.vue
@@ -476,7 +476,7 @@ const handleSubmit = debounce((instance) => {
...form.value,
tunnelGatewayDtoList: serialNumberList.value
}
- console.info("🚀 ~method:data -----", data)
+ // console.info("🚀 ~method:data -----", data)
addTunnel(data).then(res => {
if (res.code === 1000) {
ElMessage.success('新增成功')
diff --git a/src/views/tunnel-simulate/index.vue b/src/views/tunnel-simulate/index.vue
index 285d519..5b8137a 100644
--- a/src/views/tunnel-simulate/index.vue
+++ b/src/views/tunnel-simulate/index.vue
@@ -743,11 +743,11 @@ const initWebSocket = () => {
};
//连接成功建立的回调方法
socket.onopen = function () {
- console.log("ws连接成功");
+ // console.log("ws连接成功");
};
//接收到消息的回调方法
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") {
diff --git a/src/views/tunnel-simulate/tunnel-list.vue b/src/views/tunnel-simulate/tunnel-list.vue
index a0f0e73..8450329 100644
--- a/src/views/tunnel-simulate/tunnel-list.vue
+++ b/src/views/tunnel-simulate/tunnel-list.vue
@@ -336,7 +336,7 @@ const handleSubmit = debounce((instance) => {
...form.value,
tunnelGatewayDtoList: serialNumberList.value
}
- console.info("🚀 ~method:data -----", data)
+ // console.info("🚀 ~method:data -----", data)
addTunnel(data).then(res => {
if (res.code === 1000) {
ElMessage.success('新增成功')
diff --git a/src/views/tunnel/index.vue b/src/views/tunnel/index.vue
index 7015df3..4503123 100644
--- a/src/views/tunnel/index.vue
+++ b/src/views/tunnel/index.vue
@@ -588,7 +588,7 @@ const getTunnel = (id) => {
}
});
} else {
- console.info("🚀 ~method: tunnelList.value -----", tunnelList.value)
+ // console.info("🚀 ~method: tunnelList.value -----", tunnelList.value)
// tunnelList.value = res.data;
getScreenInfo(res.data[0]?.value);
}
@@ -699,11 +699,11 @@ const initWebSocket = () => {
};
//连接成功建立的回调方法
socket.onopen = function () {
- console.log("ws连接成功");
+ // console.log("ws连接成功");
};
//接收到消息的回调方法
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 91b3fc90c2f2ba59a63cba3521c2b9ea7b59ba9e Mon Sep 17 00:00:00 2001
From: odjbin <1042039504@qq.com>
Date: Thu, 19 Sep 2024 16:19:23 +0800
Subject: [PATCH 13/13] =?UTF-8?q?fix=20:=20=E4=BF=AE=E6=94=B9=E8=AE=BE?=
=?UTF-8?q?=E5=A4=87=E7=AE=A1=E7=90=86-=E5=BA=8F=E5=88=97=E5=8F=B7?=
=?UTF-8?q?=E5=AE=BD=E5=BA=A6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/views/device-manage/index.vue | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/src/views/device-manage/index.vue b/src/views/device-manage/index.vue
index 375c274..3e20f2a 100644
--- a/src/views/device-manage/index.vue
+++ b/src/views/device-manage/index.vue
@@ -76,7 +76,7 @@
>
-
+
@@ -541,7 +541,7 @@ getList()