浏览代码

add scoped

haojianlong 5 年之前
父节点
当前提交
498a48f2fe
共有 2 个文件被更改,包括 86 次插入74 次删除
  1. 1 1
      src/views/point/dynamicdata/addRelation/index.vue
  2. 85 73
      src/views/point/dynamicdata/index.vue

+ 1 - 1
src/views/point/dynamicdata/addRelation/index.vue

@@ -603,7 +603,7 @@ export default {
   }
 };
 </script>
-<style lang="scss">
+<style lang="scss" scoped>
 #addRelation {
   height: 100%;
   background-color: #fff;

+ 85 - 73
src/views/point/dynamicdata/index.vue

@@ -14,79 +14,89 @@
       ></el-tab-pane>
     </el-tabs>
     <div class="query-area">
-      <el-form ref="form" :model="form" label-width="100px" :inline="true">
-        <el-form-item>
-          <el-input placeholder="请输入设备标识关键字" v-model="form.keywords" class="input-with-select">
-            <el-button slot="append" icon="el-icon-search"></el-button>
-          </el-input>
-        </el-form-item>
-        <el-form-item label="数据源">
-          <el-select
-            v-model="form.source"
-            multiple
-            collapse-tags
-            style="margin-left: 10px;"
-            placeholder="全部"
-            filterable
-          >
-            <el-option
-              v-for="item in options"
-              :key="item.value"
-              :label="item.label"
-              :value="item.value"
-            ></el-option>
-          </el-select>
-        </el-form-item>
-        <el-form-item label="数字字典">
-          <el-select
-            v-model="form.dir"
-            multiple
-            collapse-tags
-            style="margin-left: 10px;"
-            placeholder="全部"
-            filterable
-          >
-            <el-option
-              v-for="item in options"
-              :key="item.value"
-              :label="item.label"
-              :value="item.value"
-            ></el-option>
-          </el-select>
-        </el-form-item>
-        <el-form-item label="位置标签">
-          <el-select
-            v-model="form.position"
-            multiple
-            collapse-tags
-            style="margin-left: 10px;"
-            placeholder="全部"
-            filterable
-          >
-            <el-option
-              v-for="item in options"
-              :key="item.value"
-              :label="item.label"
-              :value="item.value"
-            ></el-option>
-          </el-select>
-        </el-form-item>
+      <el-form ref="form" :model="form" label-width="70px" :inline="true">
+        <el-row>
+          <el-col :span="6">
+            <el-form-item>
+              <el-input placeholder="请输入设备标识关键字" v-model="form.keywords" class="input-with-select">
+                <el-button slot="append" icon="el-icon-search"></el-button>
+              </el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="数据源">
+              <el-select
+                v-model="form.source"
+                multiple
+                collapse-tags
+                style="margin-left: 10px;"
+                placeholder="全部"
+                filterable
+              >
+                <el-option
+                  v-for="item in options"
+                  :key="item.value"
+                  :label="item.label"
+                  :value="item.value"
+                ></el-option>
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="数字字典">
+              <el-select
+                v-model="form.dir"
+                multiple
+                collapse-tags
+                style="margin-left: 10px;"
+                placeholder="全部"
+                filterable
+              >
+                <el-option
+                  v-for="item in options"
+                  :key="item.value"
+                  :label="item.label"
+                  :value="item.value"
+                ></el-option>
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="位置标签">
+              <el-select
+                v-model="form.position"
+                multiple
+                collapse-tags
+                style="margin-left: 10px;"
+                placeholder="全部"
+                filterable
+              >
+                <el-option
+                  v-for="item in options"
+                  :key="item.value"
+                  :label="item.label"
+                  :value="item.value"
+                ></el-option>
+              </el-select>
+            </el-form-item>
+          </el-col>
+        </el-row>
       </el-form>
     </div>
     <div class="table-area">
-      <el-table :data="tableData" style="width: 100%" height="calc(100% - 0px)" v-show="curType==1">
+      <el-table :data="tableData" style="width: 100%" height="100%" v-show="curType==1">
         <el-table-column label="设备标识">
-          <el-table-column prop="province" label="设备标识" min-width="10%"></el-table-column>
-          <el-table-column prop="city" label="位置标签" min-width="10%"></el-table-column>
-          <el-table-column prop="address" label="数据源" min-width="15%"></el-table-column>
+          <el-table-column prop="province" label="设备标识"></el-table-column>
+          <el-table-column prop="city" label="位置标签"></el-table-column>
+          <el-table-column prop="address" label="数据源"></el-table-column>
         </el-table-column>
         <el-table-column label="设备实例">
-          <el-table-column prop="province" label="数字字典设备类型" min-width="15%"></el-table-column>
-          <el-table-column prop="city" label="对应的设备实例" min-width="15%"></el-table-column>
-          <el-table-column prop="address" label="实例所在建筑楼层" min-width="15%"></el-table-column>
-          <el-table-column prop="address" label="实例所在业务空间" min-width="20%"></el-table-column>
+          <el-table-column prop="province" label="数字字典设备类型"></el-table-column>
+          <el-table-column prop="city" label="对应的设备实例"></el-table-column>
+          <el-table-column prop="address" label="实例所在建筑楼层"></el-table-column>
+          <el-table-column prop="address" label="实例所在业务空间"></el-table-column>
         </el-table-column>
-        <el-table-column prop="action" label="操作" min-width="10%">
+        <el-table-column prop="action" label="操作">
           <template slot-scope="scope">
             <el-button
               size="mini"
@@ -337,23 +347,24 @@ export default {
   }
 };
 </script>
-<style lang="scss">
+<style lang="scss" scoped>
 #dynamicdata {
   overflow: hidden;
   height: 100%;
   background-color: #fff;
   padding: 10px;
   position: relative;
-  .text-right {
+  /deep/ .text-right {
     text-align: right;
   }
-  .query-item {
-    width: 20%;
-    display: inline-block;
-  }
   .table-area {
     width: calc(100% - 2px);
-    height: calc(100% - 190px);
+    height: calc(100% - 215px);
+    td div {
+      white-space: nowrap;
+      text-overflow: ellipsis;
+      overflow: hidden;
+    }
   }
   .fr {
     padding-top: 10px;
@@ -361,3 +372,4 @@ export default {
   }
 }
 </style>
+