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

This commit is contained in:
gtz 2024-03-21 10:30:57 +08:00
commit 347e51e9a4
2 changed files with 2 additions and 2 deletions

View File

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

View File

@ -88,7 +88,7 @@ export default class Glass {
this.el.style.width = size ? `${size}px` : "16px"; this.el.style.width = size ? `${size}px` : "16px";
this.el.style.height = size ? `${size}px` : "16px"; this.el.style.height = size ? `${size}px` : "16px";
this.el.style.transformOrigin = "center"; 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.zIndex = "100";
this.el.style.pointerEvents = "none"; this.el.style.pointerEvents = "none";
// this.el.style.transform = `rotate(${angle}deg) skew(32deg, 8deg)`; // this.el.style.transform = `rotate(${angle}deg) skew(32deg, 8deg)`;