zhulizhen1111 4 years ago
parent
commit
df462c1b14

+ 1 - 1
src/components/Select/Drop.vue

@@ -223,7 +223,7 @@ export default {
          max-height: 248px;
          overflow: auto;
          z-index: 9999;
-         border: 1px solid #ccc;
+         border: 1px solid #e6e6e6;
          background: #fff;
 
          .p-select-option-selected {

+ 1 - 1
src/components/Select/static/stylus/palette.styl

@@ -133,7 +133,7 @@ $grey-800=#333940
 $grey-700=#454d54
 $grey-600=#646c73
 $grey-500=#8d9399
-$grey-400=#c3c7cb
+$grey-400=#e6e6e6
 $grey-300=#e4e5e7
 $grey-200=#eff0f1
 $grey-100=#f5f6f7

+ 11 - 3
src/views/equipment/table/eqDetaileDialog.vue

@@ -10,8 +10,16 @@
             <el-input placeholder='请输入安装位置搜索' style='width:192px;margin-right:12px' size='small' prefix-icon='el-icon-search' v-model='input'></el-input>
             <el-input placeholder='请输入服务商搜索' style='width:192px;margin-right:12px' size='small' prefix-icon='el-icon-search' v-model='input'></el-input>
             <Select width='120' v-model='floor' tipPlace='top' caption='楼层:' size='small' :selectdata='floorSelect'></Select>
-            <Select v-model='sbglgs' width='180' tipPlace='top' caption='管理归属' size='small' :selectdata='sbglgsOption'></Select>
-            <Select width='146' style='margin-left:12px;' v-model='status' tipPlace='top' caption='设备状态' size='small' :selectdata='statusOption'></Select>
+            <Select v-model='sbglgs' width='180' tipPlace='top' style='margin-top:12px;' caption='管理归属' size='small' :selectdata='sbglgsOption'></Select>
+            <Select
+                width='146'
+                style='margin-left:12px;margin-top:12px;'
+                v-model='status'
+                tipPlace='top'
+                caption='设备状态'
+                size='small'
+                :selectdata='statusOption'
+            ></Select>
         </div>
         <el-table :data='tableData' :border='true' style='width: 100%;amrgin-bottom:30px'>
             <el-table-column type='index' label='序号' width='80'></el-table-column>
@@ -213,7 +221,7 @@ export default {
     .gdqd-dialog-top {
         display: flex;
         flex-wrap: wrap;
-        height: 90px;
+        margin-bottom: 12px;
     }
     td {
         overflow: hidden;

+ 9 - 3
src/views/equipment/table/zwTable.vue

@@ -15,7 +15,14 @@
                 style='width:180px;margin-left:12px;margin-right:12px'
             ></el-date-picker>
             <el-date-picker size='small' v-model='yssjwcsj' type='date' placeholder='选择验收日期' @change='getList' style='width:180px;margin-right:12px'></el-date-picker>
-            <Select width='180' tipPlace='top' caption='验收结果' :selectdata='dataSelect2' :placeholder='"请选择"' @change='getList'></Select>
+            <Select
+                width='180'
+                tipPlace='top'
+                caption='验收结果'
+                :selectdata='dataSelect2'
+                :placeholder='"请选择"'
+                style='margin-right:12px'
+            >@change='getList'></Select>
             <el-input
                 placeholder='请按照按照实施方案说明搜索'
                 size='small'
@@ -192,8 +199,7 @@ export default {
 .zw-list {
     .eq-list-top {
         display: flex;
-        height: 90px;
-        flex-wrap: wrap;
+        margin-bottom: 12px;
     }
     td {
         overflow: hidden;