Browse Source

modify some css

haojianlong 5 years ago
parent
commit
51fe1336b3

+ 1 - 1
src/components/point/dynamicdata/historyDialog.vue

@@ -1,5 +1,5 @@
 <template>
-  <el-dialog title="本次对应记录" :visible.sync="dialogVisible" width="60%" @close="handleClose" id="historyAction" custom-class="act-history">
+  <el-dialog title="本次对应记录" :visible.sync="dialogVisible" width="70%" @close="handleClose" id="historyAction" custom-class="act-history">
     <span>提示:可使用Contorl+F 搜索关键字</span>
     <div>
       <el-table :data="tableData" style="width: 100%;" :show-header="showheader" height="400px">

+ 14 - 8
src/views/point/dynamicdata/index.vue

@@ -22,24 +22,24 @@
     <div class="query-area">
       <el-form ref="form" :model="form" :inline="true">
         <el-row>
-          <el-col :span="4">
+          <div class="query-item">
             <el-form-item>
               <el-input placeholder="请输入设备标识关键字" v-model="form.EquipmentMark" class="input-with-select">
                 <el-button slot="append" icon="el-icon-search" @click="queryTableData"></el-button>
               </el-input>
             </el-form-item>
-          </el-col>
-          <el-col :span="5">
+          </div>
+          <div class="query-item">
             <label>数据源</label>
             <dataSource :Related="true" @change="changeDataSource"></dataSource>
-          </el-col>
-          <el-col :span="7">
+          </div>
+          <div class="query-item">
             <dictionary-device @change="changeDictionary" :Related="true"></dictionary-device>
-          </el-col>
-          <el-col :span="6">
+          </div>
+          <div class="query-item">
             <label>位置标签</label>
             <locationFlag :Related="true" @change="changeLocationFlag"></locationFlag>
-          </el-col>
+          </div>
         </el-row>
       </el-form>
     </div>
@@ -308,6 +308,12 @@ export default {
   /deep/ .text-right {
     text-align: right;
   }
+  .query-item {
+    float: left;
+    & + .query-item {
+      margin-left: 10px;
+    }
+  }
   .table-area {
     width: calc(100% - 2px);
     height: calc(100% - 215px);