fix : 修复隧道编辑bug,注释log
This commit is contained in:
@@ -382,7 +382,7 @@ function loadModel(path) {
|
|||||||
(xhr) => {
|
(xhr) => {
|
||||||
//这里可以拿到加载的进度条!!!
|
//这里可以拿到加载的进度条!!!
|
||||||
// console.log(xhr);
|
// console.log(xhr);
|
||||||
console.log((xhr.loaded / xhr.total) * 100 + "% loaded");
|
// console.log((xhr.loaded / xhr.total) * 100 + "% loaded");
|
||||||
},
|
},
|
||||||
(err) => {
|
(err) => {
|
||||||
reject(err);
|
reject(err);
|
||||||
|
|||||||
@@ -137,7 +137,7 @@ async function handleMounted() {
|
|||||||
params.form
|
params.form
|
||||||
);
|
);
|
||||||
// modelList.value = await initData(params.tunnelId, 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.editTunnelInit(toRaw(modelList.value));
|
||||||
demo.SignsInf(params.form.tunnelAlias, String(params.tunnelLength));
|
demo.SignsInf(params.form.tunnelAlias, String(params.tunnelLength));
|
||||||
} catch (err) {
|
} catch (err) {
|
||||||
|
|||||||
@@ -4,13 +4,23 @@ import { apiSaveEquipment, initSceneData } from "../api/tunnelScene";
|
|||||||
|
|
||||||
export const useModelSceneStore = defineStore("modelSceneData", () => {
|
export const useModelSceneStore = defineStore("modelSceneData", () => {
|
||||||
let equipmentList = ref([]);
|
let equipmentList = ref([]);
|
||||||
|
let tunnelGatewayDtoList = ref([]);
|
||||||
|
let serialNumber = ref("");
|
||||||
|
let tunnelAlias = ref("");
|
||||||
|
let serialNumberPrefix = ref("");
|
||||||
let requestOtherConfig = ref({});
|
let requestOtherConfig = ref({});
|
||||||
|
|
||||||
function initModelData(tunnelId, otherConfig) {
|
function initModelData(tunnelId, otherConfig) {
|
||||||
return new Promise((resolve, reject) => {
|
return new Promise((resolve, reject) => {
|
||||||
|
console.info("🚀 ~method:otherConfig -----", otherConfig)
|
||||||
|
tunnelAlias.value=otherConfig.tunnelAlias
|
||||||
handleSettingOtherConfig(otherConfig, requestOtherConfig);
|
handleSettingOtherConfig(otherConfig, requestOtherConfig);
|
||||||
initSceneData(tunnelId)
|
initSceneData(tunnelId)
|
||||||
.then((res) => {
|
.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) {
|
if (res.data.tunnelThreeConfig) {
|
||||||
equipmentList.value = JSON.parse(res.data.tunnelThreeConfig);
|
equipmentList.value = JSON.parse(res.data.tunnelThreeConfig);
|
||||||
} else {
|
} else {
|
||||||
@@ -34,6 +44,10 @@ export const useModelSceneStore = defineStore("modelSceneData", () => {
|
|||||||
return new Promise((resolve, reject) => {
|
return new Promise((resolve, reject) => {
|
||||||
initSceneData(tunnelId)
|
initSceneData(tunnelId)
|
||||||
.then((res) => {
|
.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) {
|
if (res.data.tunnelThreeConfig) {
|
||||||
equipmentList.value = JSON.parse(res.data.tunnelThreeConfig);
|
equipmentList.value = JSON.parse(res.data.tunnelThreeConfig);
|
||||||
} else {
|
} else {
|
||||||
@@ -61,6 +75,10 @@ export const useModelSceneStore = defineStore("modelSceneData", () => {
|
|||||||
pointGap
|
pointGap
|
||||||
),
|
),
|
||||||
modelEquipmentList: toRaw(equipmentList.value),
|
modelEquipmentList: toRaw(equipmentList.value),
|
||||||
|
serialNumber:serialNumber.value,
|
||||||
|
tunnelAlias:tunnelAlias.value,
|
||||||
|
serialNumberPrefix:serialNumberPrefix.value,
|
||||||
|
tunnelGatewayDtoList:tunnelGatewayDtoList.value,
|
||||||
...requestOtherConfig,
|
...requestOtherConfig,
|
||||||
})
|
})
|
||||||
.then((res) => {
|
.then((res) => {
|
||||||
@@ -91,6 +109,10 @@ export const useModelSceneStore = defineStore("modelSceneData", () => {
|
|||||||
pointGap
|
pointGap
|
||||||
),
|
),
|
||||||
modelEquipmentList: toRaw(equipmentList.value),
|
modelEquipmentList: toRaw(equipmentList.value),
|
||||||
|
serialNumber:serialNumber.value,
|
||||||
|
tunnelAlias:tunnelAlias.value,
|
||||||
|
serialNumberPrefix:serialNumberPrefix.value,
|
||||||
|
tunnelGatewayDtoList:tunnelGatewayDtoList.value,
|
||||||
...requestOtherConfig,
|
...requestOtherConfig,
|
||||||
})
|
})
|
||||||
.then((res) => {
|
.then((res) => {
|
||||||
|
|||||||
@@ -85,12 +85,12 @@ const initWebSocket = () => {
|
|||||||
};
|
};
|
||||||
//连接成功建立的回调方法
|
//连接成功建立的回调方法
|
||||||
socket.onopen = function () {
|
socket.onopen = function () {
|
||||||
console.log("ws连接成功");
|
// console.log("ws连接成功");
|
||||||
}
|
}
|
||||||
//接收到消息的回调方法
|
//接收到消息的回调方法
|
||||||
socket.onmessage = function (event) {
|
socket.onmessage = function (event) {
|
||||||
dataList.value.push(JSON.parse(event.data))
|
dataList.value.push(JSON.parse(event.data))
|
||||||
console.log("服务器返回的信息: ", JSON.parse(event.data));
|
// console.log("服务器返回的信息: ", JSON.parse(event.data));
|
||||||
}
|
}
|
||||||
//连接关闭的回调方法
|
//连接关闭的回调方法
|
||||||
socket.onclose = function () {
|
socket.onclose = function () {
|
||||||
|
|||||||
@@ -394,10 +394,10 @@ const clearWinDataSelectedOption=()=>{
|
|||||||
winDataSelectedOption.value=[]
|
winDataSelectedOption.value=[]
|
||||||
}
|
}
|
||||||
const changeWindDataSerialNumber = (value,options) => {
|
const changeWindDataSerialNumber = (value,options) => {
|
||||||
console.info("🚀 ~method:changeWindDataSerialNumber -----", value,options)
|
// console.info("🚀 ~method:changeWindDataSerialNumber -----", value,options)
|
||||||
options?.forEach(item=>{
|
options?.forEach(item=>{
|
||||||
if(item.value==value){
|
if(item.value==value){
|
||||||
console.info("🚀 ~method:item.label -----", item.label)
|
// console.info("🚀 ~method:item.label -----", item.label)
|
||||||
if(item.label.indexOf('PLC')>=0){
|
if(item.label.indexOf('PLC')>=0){
|
||||||
winDataSelectedOption.value=[]
|
winDataSelectedOption.value=[]
|
||||||
}else{
|
}else{
|
||||||
@@ -469,7 +469,7 @@ const editEquip = debounce(() => {
|
|||||||
sensorList: newSensor,
|
sensorList: newSensor,
|
||||||
// shuntList: editFenLiuData.value,
|
// shuntList: editFenLiuData.value,
|
||||||
}
|
}
|
||||||
console.info("🚀 ~ file:index method: line:478 -----",basicData)
|
// console.info("🚀 ~ file:index method: line:478 -----",basicData)
|
||||||
editEquipment(basicData).then(res => {
|
editEquipment(basicData).then(res => {
|
||||||
if (res.code === 1000) {
|
if (res.code === 1000) {
|
||||||
loading.close()
|
loading.close()
|
||||||
|
|||||||
@@ -476,7 +476,7 @@ const handleSubmit = debounce((instance) => {
|
|||||||
...form.value,
|
...form.value,
|
||||||
tunnelGatewayDtoList: serialNumberList.value
|
tunnelGatewayDtoList: serialNumberList.value
|
||||||
}
|
}
|
||||||
console.info("🚀 ~method:data -----", data)
|
// console.info("🚀 ~method:data -----", data)
|
||||||
addTunnel(data).then(res => {
|
addTunnel(data).then(res => {
|
||||||
if (res.code === 1000) {
|
if (res.code === 1000) {
|
||||||
ElMessage.success('新增成功')
|
ElMessage.success('新增成功')
|
||||||
|
|||||||
@@ -743,11 +743,11 @@ const initWebSocket = () => {
|
|||||||
};
|
};
|
||||||
//连接成功建立的回调方法
|
//连接成功建立的回调方法
|
||||||
socket.onopen = function () {
|
socket.onopen = function () {
|
||||||
console.log("ws连接成功");
|
// console.log("ws连接成功");
|
||||||
};
|
};
|
||||||
//接收到消息的回调方法
|
//接收到消息的回调方法
|
||||||
socket.onmessage = function (event) {
|
socket.onmessage = function (event) {
|
||||||
console.log("服务器返回的信息: ", JSON.parse(event.data));
|
// console.log("服务器返回的信息: ", JSON.parse(event.data));
|
||||||
const type = JSON.parse(event.data).type;
|
const type = JSON.parse(event.data).type;
|
||||||
const data = JSON.parse(event.data).data;
|
const data = JSON.parse(event.data).data;
|
||||||
if (type === "equipment") {
|
if (type === "equipment") {
|
||||||
|
|||||||
@@ -336,7 +336,7 @@ const handleSubmit = debounce((instance) => {
|
|||||||
...form.value,
|
...form.value,
|
||||||
tunnelGatewayDtoList: serialNumberList.value
|
tunnelGatewayDtoList: serialNumberList.value
|
||||||
}
|
}
|
||||||
console.info("🚀 ~method:data -----", data)
|
// console.info("🚀 ~method:data -----", data)
|
||||||
addTunnel(data).then(res => {
|
addTunnel(data).then(res => {
|
||||||
if (res.code === 1000) {
|
if (res.code === 1000) {
|
||||||
ElMessage.success('新增成功')
|
ElMessage.success('新增成功')
|
||||||
|
|||||||
@@ -588,7 +588,7 @@ const getTunnel = (id) => {
|
|||||||
}
|
}
|
||||||
});
|
});
|
||||||
} else {
|
} else {
|
||||||
console.info("🚀 ~method: tunnelList.value -----", tunnelList.value)
|
// console.info("🚀 ~method: tunnelList.value -----", tunnelList.value)
|
||||||
// tunnelList.value = res.data;
|
// tunnelList.value = res.data;
|
||||||
getScreenInfo(res.data[0]?.value);
|
getScreenInfo(res.data[0]?.value);
|
||||||
}
|
}
|
||||||
@@ -699,11 +699,11 @@ const initWebSocket = () => {
|
|||||||
};
|
};
|
||||||
//连接成功建立的回调方法
|
//连接成功建立的回调方法
|
||||||
socket.onopen = function () {
|
socket.onopen = function () {
|
||||||
console.log("ws连接成功");
|
// console.log("ws连接成功");
|
||||||
};
|
};
|
||||||
//接收到消息的回调方法
|
//接收到消息的回调方法
|
||||||
socket.onmessage = function (event) {
|
socket.onmessage = function (event) {
|
||||||
console.log("服务器返回的信息: ", JSON.parse(event.data));
|
// console.log("服务器返回的信息: ", JSON.parse(event.data));
|
||||||
const type = JSON.parse(event.data).type;
|
const type = JSON.parse(event.data).type;
|
||||||
const data = JSON.parse(event.data).data;
|
const data = JSON.parse(event.data).data;
|
||||||
if (type === "equipment") {
|
if (type === "equipment") {
|
||||||
|
|||||||
Reference in New Issue
Block a user