From 1ed195b4b507082cc45599c87224c57ef6e3e2c8 Mon Sep 17 00:00:00 2001 From: Hcat <2768237203@qq.com> Date: Wed, 28 Feb 2024 00:35:54 +0800 Subject: [PATCH] =?UTF-8?q?=E5=AE=8C=E6=88=90=E4=B8=80=E5=8D=8A?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../content/tunnelScene/PreviewScene.vue | 17 ++++++++++++++++- .../content/tunnelScene/sceneClass/demo.js | 2 +- src/views/tunnel/index.vue | 13 ++++++++----- 3 files changed, 25 insertions(+), 7 deletions(-) diff --git a/src/components/content/tunnelScene/PreviewScene.vue b/src/components/content/tunnelScene/PreviewScene.vue index 948ab07..b982ae7 100644 --- a/src/components/content/tunnelScene/PreviewScene.vue +++ b/src/components/content/tunnelScene/PreviewScene.vue @@ -63,11 +63,22 @@ const loader = new OBJLoader(); let hdrLoader = new RGBELoader(); let backColorSet = three.sRGBEncoding; const modelStore = useModelSceneStore(); -const params = defineProps(["isedit", "tunnelId", "tunnelLen", "tunnelName"]); //接收参数看是不是编辑模式,如果是编辑模式,则需要做一些处理 +const params = defineProps(["isedit", "tunnelId", "tunnelLen", "tunnelName", "largeScreen"]); //接收参数看是不是编辑模式,如果是编辑模式,则需要做一些处理 let isedit = ref(params.isedit) +let fanData = reactive(); + +watch( + () => params.largeScreen, + (now) => { + params.largeScreen = now; + fanData = (toRaw(params.largeScreen.value)).frequencyChangerList; + console.log(fanData); + }, + { deep: true } +); // const form = ref({ // tunnelName: "", // serialNumber: "", @@ -144,6 +155,7 @@ 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) => { @@ -343,6 +355,9 @@ function previewEquInfProcess(equipmentList, targetP) { } +function checkFanColor(fanData) { + demo.scene.getObjectByName('1号变频器'); +} diff --git a/src/components/content/tunnelScene/sceneClass/demo.js b/src/components/content/tunnelScene/sceneClass/demo.js index 4b65ecc..6c79dc1 100644 --- a/src/components/content/tunnelScene/sceneClass/demo.js +++ b/src/components/content/tunnelScene/sceneClass/demo.js @@ -512,7 +512,7 @@ export default class Demo { } SignsInf(tunnelName, tunnelLength) { let Signs = this.scene.getObjectByName('streetSigns'); - console.log(Signs); + // console.log(Signs); const tag = new this.THREE.Mesh( new this.THREE.PlaneGeometry(100, 76), new this.THREE.MeshBasicMaterial({ color: "white" }) diff --git a/src/views/tunnel/index.vue b/src/views/tunnel/index.vue index d4b3a97..8238362 100644 --- a/src/views/tunnel/index.vue +++ b/src/views/tunnel/index.vue @@ -34,7 +34,7 @@ + :tunnelName="tunnelName" :largeScreen="largeScreen">
@@ -87,6 +87,7 @@ import { getLargeScreen, getLargeScreenInfo, getTunnelBySiteId } from "@/api/lar import { ElMessage, ElMessageBox } from "element-plus"; import { getUserInfo } from "@/api/login"; import { initSceneData } from "@/api/tunnelScene"; +import { computed } from "vue"; const authStore = useAuthStore(); const router = useRouter(); const previewId = reactive(router.currentRoute.value.params.tunnelId) @@ -190,9 +191,9 @@ const getOtherInfo = () => { currentSiteId.value = res.data.siteOption[0].value currentSite.value = res.data.siteOption[0].label localStorage.setItem('site', currentSite.value) - if(res.data.tunnelOption.length === 0){ + if (res.data.tunnelOption.length === 0) { getTunnel(res.data.siteOption[0].value) - }else { + } else { tunnelList.value = res.data.tunnelOption } if (previewId) { @@ -241,6 +242,7 @@ const getScreenInfo = (id) => { showBadLoading.value = 1 } largeScreenData.value = res.data; + // console.log(largeScreenData.value); } else { ElMessage.warning(res.msg) } @@ -254,13 +256,14 @@ const getScreenInfo = (id) => { } }; //根据站点id获取隧道信息 +let largeScreen = computed(() => largeScreenData) const getTunnel = (id) => { getTunnelBySiteId(id).then((res) => { if (res?.code === 1000) { - if(res.data.length === 0){ + if (res.data.length === 0) { ElMessage.warning('该站点下无隧道, 请新增隧道后再尝试!') tunnelList.value = [] - }else { + } else { getScreenInfo(res.data[0]?.value) tunnelName = res.data[0].label tunnelList.value = res.data