diff --git a/src/assets/indexImg/intelligentShelves.png b/src/assets/indexImg/intelligentShelves.png new file mode 100644 index 0000000..37005d1 Binary files /dev/null and b/src/assets/indexImg/intelligentShelves.png differ diff --git a/src/views/FactoryView/threeMap.vue b/src/views/FactoryView/threeMap.vue index 4e3fb2c..d147d62 100644 --- a/src/views/FactoryView/threeMap.vue +++ b/src/views/FactoryView/threeMap.vue @@ -635,6 +635,9 @@ const init = () => { // const raycaster = new THREE.Raycaster() let mouse = new THREE.Vector2() let intersects = null + + //双击镜头放大 + /* labelRenderer.domElement.addEventListener('dblclick', function (event: any) { mouse.x = (event.clientX / window.innerWidth) * 2 - 1; @@ -665,7 +668,7 @@ const init = () => { tween1.start() } }); - +*/ //控制对象的透明度来实现闪烁效果 function reader(torus: any) { @@ -1014,14 +1017,13 @@ const createBox = (size: sizeType, boxposition: positionType, boxcolor: number, function createGround() { //require('@/assets/img/Factory/cao.png') //导入材质 - const groundTexture = new THREE.TextureLoader().load(requires.ny); - groundTexture.wrapS = groundTexture.wrapT = THREE.RepeatWrapping; - groundTexture.repeat.set(100, 100); + // const groundTexture = new THREE.TextureLoader().load(''); + // groundTexture.wrapS = groundTexture.wrapT = THREE.RepeatWrapping; + // groundTexture.repeat.set(100, 100); const ground = new THREE.PlaneGeometry(1014, 681); const groundMaterial = new THREE.MeshBasicMaterial({ side: THREE.DoubleSide, - map: groundTexture, - // color: 0x00ff00, + color: 0x929397, // transparent: true, // opacity: 0.2, }); diff --git a/src/views/generalEnvironmentMechanical/index.vue b/src/views/generalEnvironmentMechanical/index.vue index ee13bb1..169c476 100644 --- a/src/views/generalEnvironmentMechanical/index.vue +++ b/src/views/generalEnvironmentMechanical/index.vue @@ -354,8 +354,8 @@ function getWebsocket(val) { }) } //精饰车间燃气监测 - if (data.type == "paintingGas") { - let verticalData = { name: data.msg.devName, val: data.msg.paintingGas.value, devId: data.msg.devId } + if (data.type == "Gas") { + let verticalData = { name: data.msg.devName, val: data.msg.methane.value, devId: data.msg.devId } store.changeNewVerticalNum({ type: 'Methane', data: verticalData }) } diff --git a/src/views/index.vue b/src/views/index.vue index e438c2a..63a8b19 100644 --- a/src/views/index.vue +++ b/src/views/index.vue @@ -292,6 +292,12 @@ let routerList = [ title: '微工厂缝纫设备看板', url: require("../assets/indexImg/MicrofactoryDevOnline.png"), }, + { + id: 32, + path: "/intelligentShelves", + title: '智能货架物联管理系统', + url: require("../assets/indexImg/intelligentShelves.png"), + }, ]; let lang=ref(getStoredLanguage()||'简体中文') function changelang(val){ diff --git a/src/views/intelligentShelves/components/Tip.vue b/src/views/intelligentShelves/components/Tip.vue index 0cecde3..c012ce7 100644 --- a/src/views/intelligentShelves/components/Tip.vue +++ b/src/views/intelligentShelves/components/Tip.vue @@ -1,7 +1,7 @@