Merge branch 'master' of git.picaiba.com:g7hoo/chenzhou

src/pages/3D.vue

@@ -41,7 +41,7 @@ store.$subscribe((mutation, state) => {
   ) {
     state.data1.EquipmentsArrayList.map((item) => {
       const { equipmentName, status: itemStatus } = item;
-      status.value[eqMap[equipmentName]] = 1; // TODO 目前先强制为1; statusMap[itemStatus];
+      status.value[eqMap[equipmentName]] = statusMap[itemStatus];
     });
   }
 });

src/utils/glass.js

@@ -88,7 +88,7 @@ export default class Glass {
     this.el.style.width = size ? `${size}px` : "16px";
     this.el.style.height = size ? `${size}px` : "16px";
     this.el.style.transformOrigin = "center";
-    this.el.style.transition = `all ${distance / 25}s linear`;
+    this.el.style.transition = `all ${distance / 10}s linear`;
     this.el.style.zIndex = "100";
     this.el.style.pointerEvents = "none";
     // this.el.style.transform = `rotate(${angle}deg) skew(32deg, 8deg)`;