Merge remote-tracking branch 'origin/develop' into develop

chenyabin

2021-05-14 2cbc4c3ce921f22ae2fd498098d46dbda06c0452

 src/views/Temp.vue

@@ -200,13 +200,6 @@
  z-index: 999;
}

.Waste-water {
  position: absolute;
  top: 88px;
  left: 280px;
  z-index: 999;
}

.full-screen {
  width: 100%;
  height: 100%;