解决冲突

This commit is contained in:
Hcat
2024-02-28 19:35:33 +08:00
21 changed files with 788 additions and 416 deletions

View File

@@ -68,7 +68,7 @@ const params = defineProps(["isedit", "tunnelId", "tunnelLen", "tunnelName", "la
let isedit = ref(params.isedit)
let fanData = reactive();
let fanData;
watch(
() => params.largeScreen,
@@ -135,6 +135,7 @@ async function handleMounted() {
//加载HDR背景图片
demo.loadBackground(hdrLoader, backColorSet);
demo.changeFanColor(fanData);
//先不加试试???
// watch(
// () => params.tunnelId,
@@ -155,7 +156,6 @@ async function handleMounted() {
// console.log("init", params.tunnelId);
demo.previewtunnelModeInit(toRaw(modelList.value));
demo.SignsInf(params.tunnelName, String(params.tunnelLen.value))
checkFanColor(fanData);
// watch(
// () => params.tunnelId,
// (now) => {
@@ -355,9 +355,6 @@ function previewEquInfProcess(equipmentList, targetP) {
}
function checkFanColor(fanData) {
demo.scene.getObjectByName('1号变频器');
}

View File

@@ -451,6 +451,9 @@ export default class Demo {
}
);
}
changeFanColor(fanData) {
console.log(this.scene.getObjectById(22));
}
/**
*
* @param {Boolean} option 是否禁用轨道控制器