Parcourir la source

modify css scan building and pointconfig

haojianlong il y a 5 ans
Parent
commit
ee7300111c

+ 7 - 7
src/components/data_admin/buildData/style.scss

@@ -17,7 +17,7 @@ h3 {
         display: inline-block;
         position: absolute;
         left: 0;
-        top: 60px;
+        top: 63px;
         bottom: 0;
         right: 261px;
     }
@@ -25,7 +25,7 @@ h3 {
         // height: 100%;
         width: 250px;
         position: absolute;
-        top: 60px;
+        top: 63px;
         right: 0;
         bottom: 0;
         border: 1px solid $borderColor;
@@ -36,15 +36,15 @@ h3 {
 .build_header {
     // min-width: 800px;
     width: 100%;
-    line-height: 45px;
+    // line-height: 45px;
+    height: 53px;
     width: 100%;
-    border: 1px solid $borderColor;
-    border-top: none;
+    border: 1px solid #dfe6ec;
     box-sizing: border-box;
     background-color: $bg2;
-    padding-left: 20px;
+    padding: 10px;
     box-sizing: border-box;
-    border-radius: 4px;
+    margin-bottom: 10px;
 }
 
 #buildData {

+ 2 - 2
src/components/ledger/lib/title.vue

@@ -101,9 +101,9 @@ export default {
       background-color: #e4e4e4;
       margin-right: 10px;
       .card {
-          padding: 10px;
+          padding: 10px 0 10px 20px;
           width: 140px;
-          text-align: center;
+          text-align: left;
         span {
           color: #797979;
           font-size: 13px;

+ 3 - 0
src/components/point/dynamicdata/dictionaryDevice.vue

@@ -55,5 +55,8 @@ export default {
 };
 </script>
 <style lang="less" scoped>
+/deep/ .el-form-item{
+  margin-right: 0;
+}
 </style>
 

+ 14 - 14
src/components/point/dynamicdata/equipRules.vue

@@ -7,16 +7,14 @@
         <el-col :span="23">
           <el-form ref="form" :model="form" :inline="true">
             <el-row>
-              <div class="query-item">
-                <el-form-item class="special">
-                  <el-input placeholder="请输入设备标识关键字" v-model="form.EquipmentMark" @keyup.enter.native="queryTableData">
-                    <i slot="suffix" class="el-input__icon el-icon-search" @click="queryTableData"></i>
-                  </el-input>
-                </el-form-item>
+              <div class="query-item special">
+                <el-input placeholder="请输入设备标识关键字" v-model="form.EquipmentMark" @keyup.enter.native="queryTableData">
+                  <i slot="suffix" class="el-input__icon el-icon-search" @click="queryTableData"></i>
+                </el-input>
               </div>
               <div class="query-item">
                 <label style="padding-right:9px">数据源</label>
-                <dataSource :Related="null" @change="changeDataSource" :typeName="typeName"></dataSource> 
+                <dataSource :Related="null" @change="changeDataSource" :typeName="typeName"></dataSource>
               </div>
               <div class="query-item">
                 <dictionary-device @change="changeDictionary" :Related="null" :typeName="typeName"></dictionary-device>
@@ -55,8 +53,10 @@
         <el-table-column prop="EquipLocalName" label="对应的设备实例" show-overflow-tooltip min-width="100" class-name="td-bl"></el-table-column>
         <el-table-column label="实例所在建筑楼层" min-width="100">
           <template slot-scope="scope">
-            <el-tooltip :content="scope.row.BuildLocalName&&scope.row.FloorLocalName?scope.row.BuildLocalName+'-'+scope.row.FloorLocalName:''" placement="top">
-              <div class="tool-tip">{{scope.row.BuildLocalName&&scope.row.FloorLocalName?scope.row.BuildLocalName+'-'+scope.row.FloorLocalName:''}}</div>
+            <el-tooltip :content="scope.row.BuildLocalName&&scope.row.FloorLocalName?scope.row.BuildLocalName+'-'+scope.row.FloorLocalName:''"
+              placement="top">
+              <div class="tool-tip">{{scope.row.BuildLocalName&&scope.row.FloorLocalName?scope.row.BuildLocalName+'-'+scope.row.FloorLocalName:''}}
+              </div>
             </el-tooltip>
           </template>
         </el-table-column>
@@ -188,7 +188,7 @@ export default {
     //刷新列表
     refresh() {
       this.page.pageNumber = 1;
-      this.$emit('refresh',this.typeName);
+      this.$emit('refresh', this.typeName);
       this.getTableData();
     },
     //数据字典设备类型修改
@@ -233,9 +233,9 @@ export default {
     & + .query-item {
       margin-left: 10px;
     }
-    /deep/ .special .el-input__inner{
-      width: 220px;
-    }
+  }
+  /deep/ .special .el-input__inner {
+    width: 220px;
   }
   /deep/ .table-area {
     width: 100%;
@@ -248,7 +248,7 @@ export default {
     .td-bl {
       border-left: 1px solid #ebeef5;
     }
-    .tool-tip{
+    .tool-tip {
       white-space: nowrap;
       overflow: hidden;
       text-overflow: ellipsis;