Browse Source

空白处菜单蓝收回

zhulizhen 5 years ago
parent
commit
f7a59e5f00
3 changed files with 41 additions and 22 deletions
  1. 23 15
      src/views/audit/auditTable.vue
  2. 6 7
      src/views/audit/index.vue
  3. 12 0
      src/views/main/index.vue

+ 23 - 15
src/views/audit/auditTable.vue

@@ -1,58 +1,58 @@
 <template>
-  <div class="detailTable">
-    <el-table :data="tableList" border height="180">
-      <el-table-column prop="title" label width="105"></el-table-column>
-      <el-table-column prop="" label="冷机开启台数" align="center" width="55">
+  <div class="detailTable" style="width: 767px">
+    <el-table :data="tableList" border height="180" >
+      <el-table-column prop="title" label width=""></el-table-column>
+      <el-table-column prop="" label="冷机开启台数" align="center" width="">
         <template slot-scope="{row}">
           {{row.chillerNumSetL?(row.chillerNumSetL + row.chillerNumSetS):'--'}}
         </template>
       </el-table-column>
-      <el-table-column prop="" label="冷机出水温度" align="center" width="55">
+      <el-table-column prop="" label="冷机出水温度" align="center" width="">
          <template slot-scope="{row}">
           {{row.chillWaterOutTempSet}} ℃
         </template>
       </el-table-column>
-      <el-table-column prop="" label="冷冻泵台数" align="center" width>
+      <el-table-column prop="" label="冷冻泵台数" align="center" width=''>
          <template slot-scope="{row}">
           {{row.coolPumpNumSetL}} 大 {{row.coolPumpNumSetS}} 小
         </template>
       </el-table-column>
-      <el-table-column prop="" label="冷冻泵频率" align="center" width="65">
+      <el-table-column prop="" label="冷冻泵频率" align="center" width="">
          <template slot-scope="{row}">
           {{row.coolPumpFreqSet}} HZ
         </template>
       </el-table-column>
-      <el-table-column prop="" label="冷却泵台数" align="center" width>
+      <el-table-column prop="" label="冷却泵台数" align="center" width=''>
          <template slot-scope="{row}">
           {{row.chillPumpNumSetL + row.chillPumpNumSetS || '--'}} 
         </template>
       </el-table-column>
-      <el-table-column prop="" label="冷却泵频率" align="center" width="65">
+      <el-table-column prop="" label="冷却泵频率" align="center" width=''>
          <template slot-scope="{row}">
           {{row.chillPumpFreqSet || '--'}} HZ
         </template>
       </el-table-column>
-      <el-table-column prop="" label="冷却塔台数" align="center" width>
+      <el-table-column prop="" label="冷却塔台数" align="center" width=''>
          <template slot-scope="{row}">
           {{(row.coolTowerNumSetS + row.coolTowerNumSetL) || '--'}} 
         </template>
       </el-table-column>
-      <el-table-column prop="zip" label="冷却塔频率" align="center" width="65">
+      <el-table-column prop="zip" label="冷却塔频率" align="center" width="">
         <template slot-scope="{row}">
           {{row.coolTowerFreqSet || '--'}} HZ
         </template>
       </el-table-column>
-      <el-table-column prop="" label="室内平均温度" align="center" width="55">
+      <el-table-column prop="" label="室内平均温度" align="center" width="">
          <template slot-scope="{row}">
           {{row.meanTindoor || '--'}} ℃
         </template>
       </el-table-column>
-      <el-table-column prop="" label="室内最高温度" align="center" width>
+      <el-table-column prop="" label="室内最高温度" align="center" width=''>
          <template slot-scope="{row}">
           {{row.maxTindoor || '--'}} ℃
         </template>
       </el-table-column>
-      <el-table-column prop="" label="冷机负载率" align="center" width="55">
+      <el-table-column prop="" label="冷机负载率" align="center" width="">
          <template slot-scope="{row}">
           {{row.plrAllOrg || '--'}} HZ
         </template>
@@ -103,8 +103,9 @@ export default {
 };
 </script>
 
- <style lang="scss">
+ <style lang="scss" scoped>
 .detailTable {
+  margin: 0 auto;
   .el-table {
     font-size: 12px;
   }
@@ -121,3 +122,10 @@ export default {
   }
 }
 </style>
+<style lang="scss">
+.detailTable {
+  .el-table__header {
+    width: auto !important;
+  }
+}
+</style>

+ 6 - 7
src/views/audit/index.vue

@@ -238,13 +238,12 @@ export default {
       border-top: 1px solid #e4e5e7;
       margin-top: 5px;
       .appeal-left {
-        // flex: 1;
         height: 100%;
         display: flex;
         flex-direction: column;
         max-width: 460px;
         min-width: 350px;
-        padding-left: 24px;
+        padding-left: 20px;
         .appeal-left-top {
           display: flex;
           justify-content: space-between;
@@ -324,6 +323,7 @@ export default {
         }
       }
       .appeal-right {
+        position: relative;
         flex: 1;
         margin-left: 28px;
         height: 100%;
@@ -339,11 +339,9 @@ export default {
           text-align: center;
         }
         .detailContainer {
-          flex: 1;
-          overflow: scroll;
-          min-width: 762px;
+          overflow: auto;
+          // min-width: 762px;
           padding: 0 100px;
-          margin: 0 auto;
           padding-bottom: 24px;
           background: rgba(255, 255, 255, 1);
           margin-bottom: 100px;
@@ -416,6 +414,7 @@ export default {
           }
         }
         .opinion {
+          width: 100%;
           box-sizing: border-box;
           background: rgba(247, 249, 250, 1);
           box-shadow: 0px -1px 8px 0px rgba(0, 0, 0, 0.08);
@@ -434,7 +433,7 @@ export default {
             display: flex;
             align-items: center;
             input {
-              width: 697px;
+              flex: 1;
               height: 32px;
               background: rgba(255, 255, 255, 1);
               border-radius: 4px;

+ 12 - 0
src/views/main/index.vue

@@ -80,6 +80,7 @@
         <router-link :to="item.path">{{item.name}}</router-link>
       </p>
     </div>
+    <div class="mask" @click="navNone" v-if="menuShow"></div>
   </div>
 </template>
 <script>
@@ -90,6 +91,7 @@ import { queryWeather } from "@/api/main/main.js";
 export default {
   data() {
     return {
+      menuShow: false,
       menuList: [
         {
           name: "当日运行策略",
@@ -132,9 +134,11 @@ export default {
       location.reload()
     },
     navNone() {
+      this.menuShow = false
       document.getElementById("nav").className = "nav";
     },
     navBlock() {
+      this.menuShow = true
       document.getElementById("nav").className = "nav nav-hover";
     },
     // 查询当日天气
@@ -359,6 +363,14 @@ export default {
       opacity: 0.5;
     }
   }
+  .mask {
+    position: fixed;
+    top: 0;
+    left: 0;
+    right: 0;
+    bottom: 0;
+    z-index: 99;
+  }
   .nav-hover {
     width: 200px;
   }