Merge branch 'dev' of gitlab.suntrayoa.com:geqilin/energyai_vue into dev

src/pages/kb/indoor/index.vue

@@ -8,6 +8,8 @@ card-warp(title="室内气象数据", height="45px", showBackground)
       el-tab-pane(label="候车室区域", name="1")
       el-tab-pane(label="办公区域", name="2")
     el-form(:inline="true", :mode="formData")
+      el-form-item(label="设备名称:", prop="name")
+        el-input(size="mini", v-model="formData.name", clearable)
       el-form-item(label="设备编号:", prop="code")
         el-input(size="mini", v-model="formData.code", clearable)
       el-form-item
@@ -163,6 +165,7 @@ export default {
   },
   methods: {
     tabClick(tab, event) {
+      this.formData = {}
       this.getDataList()
     },
     // 获取数据列表
@@ -171,6 +174,7 @@ export default {
         url: this.$http.adornUrl('/liResource/list'),
         method: 'post',
         data: {
+          name: this.formData.name,
           code: this.formData.code,
           type: '507ba9ae22174e4dbbf32dbf34dd7139', //室内气象站
           region: Number(this.activeName), //区域类型