-
-
-
-
-
-
+
+
@@ -18,22 +9,5 @@ import TunnelScene from "@/components/content/tunnelScene/TunnelScene.vue";
From b194b07b95ea75f1273c89aaacd834728e22d7c8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=82=93=E6=B4=81?= <209192278@qq.com>
Date: Thu, 7 Dec 2023 22:53:15 +0800
Subject: [PATCH 3/3] =?UTF-8?q?=E9=82=93=E6=B4=81=20:=20=E6=B5=8B=E8=AF=95?=
=?UTF-8?q?=E6=A8=A1=E5=9E=8B=E4=B8=8A=E7=BA=BF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/components/content/tunnelScene/TunnelScene.vue | 8 ++++----
.../content/tunnelScene/childComp/EditDev.vue | 4 ++--
src/components/content/tunnelScene/sceneClass/demo.js | 10 +++++-----
3 files changed, 11 insertions(+), 11 deletions(-)
diff --git a/src/components/content/tunnelScene/TunnelScene.vue b/src/components/content/tunnelScene/TunnelScene.vue
index 2380705..0e66bf4 100644
--- a/src/components/content/tunnelScene/TunnelScene.vue
+++ b/src/components/content/tunnelScene/TunnelScene.vue
@@ -48,13 +48,13 @@ async function handleMounted() {
try {
const deviceList = [];
- let result = await loadModel("../../../../public/devicesModel/Camera.obj");
+ let result = await loadModel("/devicesModel/Camera.obj");
deviceList.push(result);
- result = await loadModel("../../../../public/devicesModel/box_device.obj");
+ result = await loadModel("/devicesModel/box_device.obj");
deviceList.push(result);
- result = await loadModel("../../../../public/devicesModel/dev2.obj");
+ result = await loadModel("/devicesModel/dev2.obj");
deviceList.push(result);
- result = await loadModel("../../../../public/devicesModel/dev3.obj");
+ result = await loadModel("/devicesModel/dev3.obj");
deviceList.push(result);
} catch (e) {}
// demo.initDevicesModel();
diff --git a/src/components/content/tunnelScene/childComp/EditDev.vue b/src/components/content/tunnelScene/childComp/EditDev.vue
index 0449ec5..ec4fa3d 100644
--- a/src/components/content/tunnelScene/childComp/EditDev.vue
+++ b/src/components/content/tunnelScene/childComp/EditDev.vue
@@ -37,7 +37,7 @@ function initDevicesModel() {
const devItem = {
devName: "传感器",
- devImgUrl: "../../../../../public/images/camera.jpg",
+ devImgUrl: "/images/camera.jpg",
};
const list = [devItem, devItem, devItem, devItem];
@@ -45,7 +45,7 @@ const devicesList = reactive(list);
const checkIndex = ref(0);
//选择设备
function checkDev(key) {
- checkIndex = key;
+ checkIndex.value = key;
emit("checkDev", key); //携带参数发射事件
}
// 添加设备
diff --git a/src/components/content/tunnelScene/sceneClass/demo.js b/src/components/content/tunnelScene/sceneClass/demo.js
index b56ff6d..2c61f69 100644
--- a/src/components/content/tunnelScene/sceneClass/demo.js
+++ b/src/components/content/tunnelScene/sceneClass/demo.js
@@ -126,7 +126,7 @@ export default class Demo {
return new Promise((resolve, reject) => {
this.gltfloader = new GLTFLoader();
this.gltfloader.load(
- "../../../../../public/tunnelModel/chanel.glb",
+ "/tunnelModel/chanel.glb",
(gltf) => {
gltf.scene.traverse((child) => {
this._forModels(child);
@@ -418,19 +418,19 @@ export default class Demo {
loadeOBJModel() {
this.devMap = new Map();
this.OBJLoader.load(
- "../../../../../public/devicesModel/Camera.obj",
+ "/devicesModel/Camera.obj",
callBack.bind(this, "dev_1")
);
this.OBJLoader.load(
- "../../../../../public/devicesModel/Camera.obj",
+ "/devicesModel/Camera.obj",
callBack.bind(this, "dev_2")
);
this.OBJLoader.load(
- "../../../../../public/devicesModel/Camera.obj",
+ "/devicesModel/Camera.obj",
callBack.bind(this, "dev_3")
);
this.OBJLoader.load(
- "../../../../../public/devicesModel/Camera.obj",
+ "/devicesModel/Camera.obj",
callBack.bind(this, "camera")
);
function callBack(param, model) {