likang

src/views/device/hyd_equipment/detail.vue

@@ -5,7 +5,7 @@
     :direction="direction"
     size="45%"
   >
-    <el-tabs v-model="activeName" type="card" @tab-click="handleClick">
+    <el-tabs v-model="activeName" type="card" @tab-click="handleClick"> 
       <el-tab-pane label="设备信息" name="first">
         <el-divider content-position="left">基础信息</el-divider>
         <el-row>
@@ -124,10 +124,20 @@ export default {
 };
 </script>
 <style scoped>
+
+
+
+
+
+.back-color{
+  background: black;
+}
+
 .detail-item {
   width: 100%;
   padding: 15px 0px;
   list-style-type: none;
+  
 }
 .item {
   font-size: 14px;
@@ -145,4 +155,5 @@ export default {
   padding-left:25px;
   padding-right:25px;
 }
+
 </style>

src/views/device/hyd_equipment/index.scss

@@ -16,7 +16,7 @@
     font-size: 12px;
   }
   .search-box-area {
-    width: 70%;
+    width: 60%;
     height: 44px;
     float: left;
   }
@@ -24,6 +24,17 @@
     width: 20%;
     height: 44px;
     float: left;
+    
+  }
+  .search-operate-area1 {
+    width: 20%;
+    height: 44px;
+    float: right;
+    
+  }
+  .f2{
+    float: right;
+    margin-left:10px;
   }
   .search-item {
     width: 25%;

src/views/device/hyd_equipment/index.vue

@@ -1,5 +1,5 @@
 <template>
-  <div class="min">
+  <div>
     <alarm @eq_type="eqSelect"></alarm>
 
     <div class="app-container">
@@ -65,23 +65,18 @@
           @click="handleRefresh"
           >重置</el-button
         >
-        <el-button
-          class="filter-item search fl"
-          :icon="this.searchDisplay ? 'el-icon-arrow-up' : 'el-icon-arrow-down'"
-          @click="searchDis"
-          >{{ word }}</el-button
-        >
+        -->
       </div>
-      <div class="list-operate-area">
+      <div class="search-operate-area1">
         <!-- <el-button size="mini" class="filter-item search fl" icon="el-icon-plus" @click="handleCreate">添加</el-button> -->
         <el-button
-          class="filter-item search fl"
+          class="filter-item search f2"
           icon="el-icon-setting"
           @click="showColumnOption"
           >列设置</el-button
         >
         <el-button
-          class="filter-item search fl"
+          class="filter-item search f2"
           icon="el-icon-refresh-right"
           @click="refresh"
           >刷新</el-button
@@ -671,9 +666,9 @@ export default {
         fixed_asset_number2: true,
         serial_number: true,
         factory_number:true,
-        check_last_time:true,
-        check_next_time:true,
-        check_status1:true,
+        check_last_time:false,
+        check_next_time:false,
+        check_status1:false,
         status1: true,
       };
     }
@@ -682,11 +677,9 @@ export default {
 </script>
 <style lang="scss" scoped>
 
+
  @import "@/views/device/hyd_equipment/index.scss";
  @import "@/views/device/hyd_equipment/alarm.scss";
- .min {
-   width: 100%;
-   min-width: 1600px;
- }
+ 
 
 </style>

src/views/device/storage_equipment/index.scss

@@ -16,7 +16,7 @@
     font-size: 12px;
   }
   .search-box-area {
-    width: 70%;
+    width: 60%;
     height: 44px;
     float: left;
   }
@@ -24,6 +24,17 @@
     width: 20%;
     height: 44px;
     float: left;
+    
+  }
+  .search-operate-area1 {
+    width: 20%;
+    height: 44px;
+    float: right;
+    
+  }
+  .f2{
+    float: right;
+    margin-left:10px;
   }
   .search-item {
     width: 25%;

src/views/device/storage_equipment/index.vue

@@ -31,14 +31,13 @@
           <!-- <el-input v-model="queryParam.code" placeholder="唯一编码" clearable class="filter-item form-search-input fl" /> -->
           <el-button class="filter-item search fl" icon="el-icon-search" @click="handleSearch">搜索</el-button>
           <el-button class="filter-item fl" icon="el-icon-refresh" @click="handleRefresh">重置</el-button>
-          <el-button class="filter-item search fl"
-            :icon="this.searchDisplay ? 'el-icon-arrow-up' : 'el-icon-arrow-down'" @click="searchDis">{{ word }}
-          </el-button>
         </div>
         <div class="list-operate-area">
           <!-- <el-button size="mini" class="filter-item search fl" icon="el-icon-plus" @click="handleCreate">添加</el-button> -->
-          <el-button class="filter-item search fl" icon="el-icon-setting" @click="showColumnOption">列设置</el-button>
-          <el-button class="filter-item search fl" icon="el-icon-refresh-right" @click="refresh">刷新</el-button>
+          <el-button class="filter-item search f2"  icon="el-icon-setting" @click="showColumnOption">列设置
+          </el-button>
+          <el-button class="filter-item search f2"  icon="el-icon-refresh-right" @click="refresh">刷新
+          </el-button>
         </div>
       </div>
       <el-table :data="data" v-loading="loading" ref="multipleTable" @selection-change="hydraulicSelectMulti"
@@ -414,9 +413,5 @@ export default {
 
  @import "@/views/device/hyd_equipment/index.scss";
  @import "@/views/device/hyd_equipment/alarm.scss";
- .min{
-  width:100%;
-  min-width: 1600px;
- }
-
+ 
 </style>