Browse Source

修改设备查询表格过滤条件,添加TaskState=-1,对表格的 el-badge做统一样式调整

shaun-sheep 4 years ago
parent
commit
0c4d65f003

+ 3 - 0
src/components/data_admin/buildTask/table/deviceTable.vue

@@ -246,6 +246,9 @@
 /deep/ .el-drawer__header {
   margin-bottom: 12px;
 }
+/deep/ .el-badge__content{
+  width: 20px;
+}
 .table-container {
   height: 100%;
   background: #fff;

+ 56 - 50
src/views/data_admin/buildTask/addTask/addDeviceTask.vue

@@ -77,54 +77,55 @@
 </template>
 
 <script>
-import { mapGetters } from "vuex"
-//组件
-import floorCascader from "@/components/ledger/lib/floorCascader"
-import myCascader from "@/components/ledger/lib/cascader"
-//api
-import { queryEquip } from "@/api/scan/request"
-import { createDeviceTask } from "@/api/data_admin/buildTaskApi"
-export default {
-  data() {
-    return {
-      params: {},
-      loading: false,
-      keycode: '',
-      page: {
-        pageSize: 50,
-        pageSizes: [10, 20, 50, 100],
-        pageNumber: 1,
-        total: 0
-      },
-      options: [{//方案
-        value: '1',
-        label: '极简'
-      }, {
-        value: '2',
-        label: '标准'
-      }],
-      tableData: [],
-      multipleSelection:[],
-      headerStyle: {
-        backgroundColor: '#e1e4e5',
-        color: '#2b2b2b',
-        lineHeight: '30px'
-      }, // 列表样式
-    }
-  },
-  computed: {
-    ...mapGetters("layout", ["projectId", "userId", "secret"])
-  },
-  components: {
-    floorCascader,
-    myCascader
-  },
-  created() {
-    this.params = this.$route.query
-    console.log(this.params)
-  },
-  mounted() {
-    this.getTableData()
+  import {mapGetters} from "vuex"
+  //组件
+  import floorCascader from "@/components/ledger/lib/floorCascader"
+  import myCascader from "@/components/ledger/lib/cascader"
+  //api
+  import {queryEquip} from "@/api/scan/request"
+  import {createDeviceTask} from "@/api/data_admin/buildTaskApi"
+
+  export default {
+    data() {
+      return {
+        params: {},
+        loading: false,
+        keycode: '',
+        page: {
+          pageSize: 50,
+          pageSizes: [10, 20, 50, 100],
+          pageNumber: 1,
+          total: 0
+        },
+        options: [{//方案
+          value: '1',
+          label: '极简'
+        }, {
+          value: '2',
+          label: '标准'
+        }],
+        tableData: [],
+        multipleSelection: [],
+        headerStyle: {
+          backgroundColor: '#e1e4e5',
+          color: '#2b2b2b',
+          lineHeight: '30px'
+        }, // 列表样式
+      }
+    },
+    computed: {
+      ...mapGetters("layout", ["projectId", "userId", "secret"])
+    },
+    components: {
+      floorCascader,
+      myCascader
+    },
+    created() {
+      this.params = this.$route.query
+      console.log(this.params)
+    },
+    mounted() {
+      this.getTableData()
   },
   watch: {
     projectId() {
@@ -220,7 +221,7 @@ export default {
       }
 
       if(this.params.isVerification){
-        params.Filters += `;(TaskState isNull || TaskState=0)`
+        params.Filters += `;(TaskState isNull || TaskState=0 || TaskState=-1)`
       }
 
       if(this.keycode){
@@ -290,6 +291,10 @@ export default {
 
 <style scoped lang='less'>
 .box {
+  /deep/ .el-badge__content {
+    width: 20px;
+  }
+
   .condition {
     padding: 10px;
     display: flex;
@@ -297,7 +302,8 @@ export default {
     flex-direction: column;
     border: 1px solid #dfe6ec;
     background: #fff;
-    .header{
+
+    .header {
       padding-bottom: 10px;
       border-bottom: 1px solid #bcbcbc;
     }

+ 1 - 1
src/views/ready/buildfloor/index.vue

@@ -204,7 +204,7 @@
         buildingQueryAndCount(bdParam, res => {
           this.buildList = res.Content;
           if (this.buildList.length) {
-            this.changeBuild(this .selectedBuildIndex);
+            this.changeBuild(this.selectedBuildIndex);
           }
         });
       },