页面调整

src/pages/kb/indoor/index.vue

@@ -7,11 +7,11 @@ card-warp(title="室内气象数据", height="45px", showBackground)
     el-tabs.myTabs(v-model="activeName", @tab-click="tabClick")
       el-tab-pane(label="候车室区域", name="1")
       el-tab-pane(label="办公区域", name="2")
-    el-form(:inline="true")
-      el-form-item(label="设备编号:")
-        el-input(size="mini")
-      el-form-item(label="")
-        el-button(type="primary", size="mini") 查询
+    el-form(:inline="true" :mode="formData")
+      el-form-item(label="设备编号:" prop="code")
+        el-input(size="mini" v-model="formData.code" clearable)
+      el-form-item()
+        el-button(type="primary", size="mini" @click="getDataList()") 查询
     .data-warp
       .data-item
         .type 温度
@@ -87,7 +87,7 @@ card-warp(title="室内气象数据", height="45px", showBackground)
           span ( PPM )
       el-table-column(
         :resizable="false",
-        prop="visitorId",
+        prop="status",
         header-align="center",
         align="center",
         label="设备状态"
@@ -135,6 +135,7 @@ export default {
     return {
       historyVisible: false,
       activeName: '1',
+      formData: {},
       dataList: [],
       dataListLoading: false,
       pageSize: 10,
@@ -156,6 +157,7 @@ export default {
         url: this.$http.adornUrl('/liResource/list'),
         method: 'post',
         data: {
+          code: this.formData.code,
           type: '507ba9ae22174e4dbbf32dbf34dd7139', //室内气象站
           region: Number(this.activeName), //区域类型
           page: page || this.pageIndex,
@@ -165,10 +167,10 @@ export default {
         if (data && data.code === 0) {
           console.log('数据', data)
           this.dataList = data.page.rows
-          this.totalSize = data.page.total
+          this.totalPage = data.page.total
         } else {
           this.dataList = []
-          this.totalSize = 0
+          this.totalPage = 0
         }
       })
     },

src/pages/kb/outdoor/index.vue

@@ -104,7 +104,7 @@ card-warp(title="室外气象数据", height="45px", showBackground)
       )
       el-table-column(
         :resizable="false",
-        prop="visitorId",
+        prop="status",
         header-align="center",
         align="center",
         label="设备状态"
@@ -151,7 +151,6 @@ card-warp(title="室外气象数据", height="45px", showBackground)
 
 <script>
 import tablePagination from '@/pages/components/tablePagination'
-// import pie from './pie'
 import history from './history'
 import chart from '@/pages/components/chart.vue'
 
@@ -159,7 +158,6 @@ export default {
   components: {
     tablePagination,
     chart,
-    // pie,
     history
   },
   data() {
@@ -198,8 +196,8 @@ export default {
     }
   },
   mounted() {
-    this.getDataListTb()
     this.getDataList()
+    this.getDataListTb()
   },
   methods: {
     // 获取数据列表
@@ -218,10 +216,10 @@ export default {
           this.dataList = data.page.rows
           this.formData.name = this.dataList[0].name
           this.formData.code = this.dataList[0].code
-          this.totalSize = data.page.total
+          this.totalPage = data.page.total
         } else {
           this.dataList = []
-          this.totalSize = 0
+          this.totalPage = 0
         }
       })
     },

src/pages/kb/power/config.js

@@ -7,7 +7,7 @@ export const tableColums = [
   },
   {
     align: 'center',
-    prop: 'B',
+    prop: 'deployLocation',
     label: '设备位置'
     // width: 182
   },
@@ -25,13 +25,13 @@ export const tableColums = [
   },
   {
     align: 'center',
-    prop: 'E',
+    prop: 'status',
     label: '设备状态',
     width: 152
   },
   {
     align: 'center',
-    prop: 'F',
+    prop: 'code',
     label: '设备编号',
     width: 152
   }

src/pages/kb/power/page.vue

@@ -21,23 +21,42 @@
         </div>
         <div>
           <el-form :inline="true" :mode="formData">
-            <el-form-item label="设备名称：">
-              <el-input size="mini" placeholder=""></el-input>
+            <el-form-item label="设备名称：" prop="name">
+              <el-input
+                v-model="formData.name"
+                size="mini"
+                placeholder=""
+                clearable
+              ></el-input>
             </el-form-item>
 
-            <el-form-item label="设备编号：">
-              <el-input size="mini" placeholder=""></el-input>
+            <el-form-item label="设备编号：" prop="code">
+              <el-input
+                v-model="formData.code"
+                size="mini"
+                placeholder=""
+                clearable
+              ></el-input>
             </el-form-item>
 
-            <el-form-item label="运行状态：">
-              <el-select size="mini" placeholder="" v-model="formData.tyoe">
-                <el-option label="正常" value="shanghai"></el-option>
-                <el-option label="不正常" value="beijing"></el-option>
+            <el-form-item label="运行状态：" prop="status">
+              <el-select
+                size="mini"
+                placeholder="请选择"
+                v-model="formData.status"
+                clearable
+              >
+                <el-option label="在线" value="1"></el-option>
+                <el-option label="离线" value="2"></el-option>
+                <el-option label="故障" value="3"></el-option>
               </el-select>
             </el-form-item>
-
             <el-form-item>
-              <el-button icon="el-icon-search" size="mini" type="primary"
+              <el-button
+                icon="el-icon-search"
+                size="mini"
+                type="primary"
+                @click="getDataList()"
                 >查询</el-button
               >
             </el-form-item>
@@ -154,10 +173,14 @@ export default {
     // 获取数据
     getDataList(page, size) {
       console.log('类型id', this.activeTab)
+      console.log('formData:', this.formData)
       this.$http({
         url: this.$http.adornUrl('/liResource/list'),
         method: 'post',
         data: {
+          name: this.formData.name,
+          code: this.formData.code,
+          status: this.formData.status,
           type: this.activeTab, //资源点类型
           page: page || this.pageIndex,
           size: size || this.pageSize