bug修复

ems-ui/src/views/basecfg/building/index.vue

@@ -5,7 +5,7 @@
         <div class="head-container">
           <el-input
             v-model="areaName"
-            placeholder="请输入服务区名称"
+            placeholder="请输入地块名称"
             clearable
             size="small"
             prefix-icon="el-icon-search"
@@ -28,10 +28,10 @@
       </el-col>
       <el-col :span="20" :xs="24">
         <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
-          <el-form-item label="地块名称" prop="bldgName">
+          <el-form-item label="建筑名称" prop="bldgName">
             <el-input
               v-model="queryParams.bldgName"
-              placeholder="请输入地块名称"
+              placeholder="请输入建筑名称"
               clearable
               @keyup.enter.native="handleQuery"
             />

ems-ui/src/views/basecfg/device/index.vue

@@ -28,22 +28,6 @@
       </el-col>
       <el-col :span="20" :xs="24">
         <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
-          <el-form-item label="设备代码" prop="deviceCode">
-            <el-input
-              v-model="queryParams.deviceCode"
-              placeholder="请输入设备代码"
-              clearable
-              @keyup.enter.native="handleQuery"
-            />
-          </el-form-item>
-          <el-form-item label="设备名称" prop="deviceName">
-            <el-input
-              v-model="queryParams.deviceName"
-              placeholder="请输入设备名称"
-              clearable
-              @keyup.enter.native="handleQuery"
-            />
-          </el-form-item>
           <el-form-item label="归属设施" prop="refFacs">
             <el-select v-model="queryParams.refFacs" >
               <el-option v-for="item in facsOptions" :label="item.facsName" :value="item.facsCode" :key="item.facsCode" />
@@ -54,6 +38,15 @@
               <el-option v-for="item in subsystemOptions" :label="item.systemName" :value="item.systemCode" :key="item.systemCode" />
             </el-select>
           </el-form-item>
+          <el-form-item label="设备名称" prop="deviceName">
+            <el-input
+              v-model="queryParams.deviceName"
+              placeholder="请输入设备名称"
+              clearable
+              @keyup.enter.native="handleQuery"
+            />
+          </el-form-item>
+
           <el-form-item>
             <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
             <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
@@ -262,6 +255,12 @@ export default {
       }
     }
   },
+  watch: {
+    // 根据名称筛选区域树
+    areaName(val) {
+      this.$refs.tree.filter(val);
+    }
+  },
   created() {
     this.getList();
     this.getAreaTree('Zoning');

ems-ui/src/views/basecfg/emsfacs/index.vue

@@ -3,7 +3,7 @@
     <el-row :gutter="20">
       <el-col :span="4" :xs="24">
         <div class="head-container">
-          <el-input v-model="areaName" placeholder="请输入区域名称" clearable size="small" prefix-icon="el-icon-search"
+          <el-input v-model="areaName" placeholder="请输入区块名称" clearable size="small" prefix-icon="el-icon-search"
             style="margin-bottom: 20px" />
         </div>
         <div class="head-container">
@@ -348,6 +348,12 @@ export default {
       }
     }
   },
+  watch: {
+    // 根据名称筛选区域树
+    areaName(val) {
+      this.$refs.tree.filter(val);
+    }
+  },
   created() {
     this.getList()
     this.getAreaTree('Area')

ems-ui/src/views/basecfg/meterdevc/index.vue

@@ -5,7 +5,7 @@
         <div class="head-container">
           <el-input
             v-model="areaName"
-            placeholder="请输入服务区名称"
+            placeholder="请输入区块名称"
             clearable
             size="small"
             prefix-icon="el-icon-search"
@@ -311,6 +311,10 @@ export default {
           }
         }
       }
+    },
+    // 根据名称筛选区域树
+    areaName(val) {
+      this.$refs.tree.filter(val);
     }
   },
   created() {