Merge branch 'master' of http://182.92.126.35:3000/msx/Vent-App

pages/filecenter/filecenter.vue

@@ -7,13 +7,13 @@
       :safeAreaInsetTop="true"
       @leftClick="fileTreeShow"
     >
-      <view class="u-nav-slot" slot="left">
+      <!-- <view class="u-nav-slot" slot="left">
         <u-icon name="list" size="20"> </u-icon>
-      </view>
+      </view> -->
     </u-navbar>
-    <view v-if="menushow" class="menupage">
+    <!-- <view v-if="menushow" class="menupage">
       <FileTreeMenu @menuClick="menuClick"></FileTreeMenu>
-    </view>
+    </view> -->
     <view v-if="!menushow" class="container">
       <view class="main">
         <view class="fileArea" style="margin-top: 15px">
@@ -266,11 +266,11 @@
 <script>
 import api from "@/api/api";
 import configService from "../../common/service/config.service";
-import FileTreeMenu from "./treeMenu/fileTreeMenu.vue";
+// import FileTreeMenu from "./treeMenu/fileTreeMenu.vue";
 export default {
-  components: {
-    FileTreeMenu,
-  },
+  // components: {
+  //   FileTreeMenu,
+  // },
   name: "filecenter",
   watch: {},
   data() {

pages/warndata/components/device-detail.vue

@@ -220,6 +220,7 @@ export default {
   }
 
   .device-content {
+    height: 704px;
     box-sizing: border-box;
     overflow-y: auto;
 

pages/warndata/components/dust-detail.vue

@@ -564,7 +564,7 @@ export default {
     // padding: 0px 10px;
     // box-sizing: border-box;
     // overflow-y: auto;
-    //height: 704px;
+    height: 704px;
     box-sizing: border-box;
     overflow-y: auto;
 

pages/warndata/components/fire-detail.vue

@@ -220,6 +220,7 @@ export default {
   }
 
   .fire-content-box {
+    height: 704px;
     box-sizing: border-box;
     overflow-y: auto;
 

pages/warndata/components/vent-detail.vue

@@ -536,6 +536,7 @@ export default {
   }
 
   .vent-content {
+    height: 704px;
     box-sizing: border-box;
     overflow-y: auto;