修改3D分布图地面材质

修改安全大屏燃气socket

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);
+    // const groundTexture = new THREE.TextureLoader().load('');
-    groundTexture.wrapS = groundTexture.wrapT = THREE.RepeatWrapping;
+    // groundTexture.wrapS = groundTexture.wrapT = THREE.RepeatWrapping;
-    groundTexture.repeat.set(100, 100);
+    // groundTexture.repeat.set(100, 100);
     const ground = new THREE.PlaneGeometry(1014, 681);
     const groundMaterial = new THREE.MeshBasicMaterial({
         side: THREE.DoubleSide,
-        map: groundTexture,
+        color: 0x929397,
-        // color: 0x00ff00,
         // transparent: true,
         // opacity: 0.2,
     });

src/views/generalEnvironmentMechanical/index.vue

@@ -354,8 +354,8 @@ function getWebsocket(val) {
             })
         }
         //精饰车间燃气监测
-        if (data.type == "paintingGas") {
+        if (data.type == "Gas") {
-            let verticalData = { name: data.msg.devName, val: data.msg.paintingGas.value, devId: data.msg.devId }
+            let verticalData = { name: data.msg.devName, val: data.msg.methane.value, devId: data.msg.devId }
             store.changeNewVerticalNum({ type: 'Methane', data: verticalData })
 
         }

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){

src/views/intelligentShelves/components/Tip.vue

@@ -16,20 +16,22 @@
     right: 151px;
     top: 16px;
 }
+
 .bian {
     width: 38px;
     height: 38px;
     border-radius: 50%;
-    background-image: repeating-radial-gradient(#CDA1B9, #BAA0A6, #909C7F,#4F657A,#E7E7E7);
+    background-image: repeating-radial-gradient(#CDA1B9, #BAA0A6, #909C7F, #4F657A, #E7E7E7);
-    animation: masked-animation 3s infinite linear;
+    animation: masked-animation 2s infinite linear;
 }
 
 @keyframes masked-animation {
     0% {
         transform: scale(0.2);
     }
+
     100% {
         transform: scale(1);
     }
-        }
+}
 </style>

src/views/intelligentShelves/index.vue

@@ -31,7 +31,7 @@
         <ShelfPanel :config="panelConfig"></ShelfPanel>
       </div>
     </div>
-      <!-- <Tip ></Tip> -->
+      <Tip ></Tip>
   </div>
 </template>
 

src/views/realtimeSecurity/index.vue

@@ -74,28 +74,13 @@ function getWebsocket(val) {
   try{
   let data = JSON.parse(val);
 
-  //精饰车间燃气监测
+  //燃气监测
-  if (data.type == "paintingGas") {
+  if (data.type == "Gas") {
     store.changepaintingGas(data.msg);
-    let verticalData = {name:data.msg.devName,val:data.msg.paintingGas.value,devId:data.msg.devId}
+    let verticalData = {name:data.msg.devName,val:data.msg.methane.value,devId:data.msg.devId}
     store.changeNewVerticalNum({type:'Methane',data:verticalData})
     
   }
-  //锅炉房燃气监测
-  if (data.type == "boilerGas") {
-    // store.changePM(data.msg)
-    store.changeboilerGas(data.msg.boilerGas);
-    let verticalData = {name:data.msg.devName,val:data.msg.boilerGas.value,devId:data.msg.devId}
-    store.changeNewVerticalNum({type:'Methane',data:verticalData})
-    
-  }
-  //食堂燃气监测
-  if (data.type == "canteenGas") {
-    // store.changeHumiture(data.msg)
-    store.changecanteenGas(data.msg.canteenGas);
-    let verticalData = {name:data.msg.devName,val:data.msg.canteenGas.value,devId:data.msg.devId}
-    store.changeNewVerticalNum({type:'Methane',data:verticalData})
-  }
   //甲醛TVOC
   if (data.type == "TVOC_CH2O") {    
     store.changeTVOC_CH2O(data.msg);

src/views/realtimeSecurityJixiefenchang/index.vue

@@ -75,27 +75,12 @@ function getWebsocket(val) {
   let data = JSON.parse(val);
  
   //精饰车间燃气监测
-  if (data.type == "paintingGas") {
+  if (data.type == "Gas") {
     store.changepaintingGas(data.msg);
-    let verticalData = {name:data.msg.devName,val:data.msg.paintingGas.value,devId:data.msg.devId}
+    let verticalData = {name:data.msg.devName,val:data.msg.methane.value,devId:data.msg.devId}
     store.changeNewVerticalNum({type:'Methane',data:verticalData})
     
   }
-  //锅炉房燃气监测
-  if (data.type == "boilerGas") {
-    // store.changePM(data.msg)
-    store.changeboilerGas(data.msg.boilerGas);
-    let verticalData = {name:data.msg.devName,val:data.msg.boilerGas.value,devId:data.msg.devId}
-    store.changeNewVerticalNum({type:'Methane',data:verticalData})
-    
-  }
-  //食堂燃气监测
-  if (data.type == "canteenGas") {
-    // store.changeHumiture(data.msg)
-    store.changecanteenGas(data.msg.canteenGas);
-    let verticalData = {name:data.msg.devName,val:data.msg.canteenGas.value,devId:data.msg.devId}
-    store.changeNewVerticalNum({type:'Methane',data:verticalData})
-  }
   //甲醛TVOC
   if (data.type == "TVOC_CH2O") {
     console.log(data.msg,"TVOC_CH2O");