设备历史

src/views/modules/device/device-history.vue

@@ -28,14 +28,14 @@
         align="center">
       </el-table-column>
       <el-table-column
-        prop="deviceId"
+        prop="deviceName"
         header-align="center"
         align="center"
         min-width="120"
         label="设备编号">
       </el-table-column>
       <el-table-column
-        prop="deviceTime"
+        prop="deviceTimeStr"
         header-align="center"
         align="center"
         min-width="160"
@@ -43,7 +43,7 @@
         label="上报时间">
       </el-table-column>
       <el-table-column
-        prop="serverTime"
+        prop="serverTimeStr"
         header-align="center"
         align="center"
         min-width="160"
@@ -51,33 +51,46 @@
         label="系统接收时间">
       </el-table-column>
       <el-table-column
-        prop="tem"
+        prop="version"
         header-align="center"
         align="center"
         min-width="100"
-        label="温度（℃）">
+        label="协议版本">
       </el-table-column>
       <el-table-column
-        prop="hum"
+        prop="ack"
         header-align="center"
         align="center"
         min-width="100"
-        label="湿度（%）">
+        label="是否需要响应">
+        <template slot-scope="scope">
+          <span>{{ scope.row.ack === '0'?'否':'是' }}</span>
+        </template>
       </el-table-column>
       <el-table-column
-        prop="-"
+        prop="longitude"
         header-align="center"
         align="center"
         min-width="100"
-        label="剩余电量（%）">
+        label="纬度">
       </el-table-column>
       <el-table-column
-        prop="-"
+        prop="latitude"
         header-align="center"
         align="center"
         min-width="100"
         :show-overflow-tooltip="true"
-        label="是否报警">
+        label="经度">
+      </el-table-column>
+      <el-table-column
+        fixed="right"
+        header-align="center"
+        align="center"
+        width="60"
+        label="操作">
+        <template slot-scope="scope">
+          <el-button type="text" size="small" @click="detailHandle(scope.row)">详情</el-button>
+        </template>
       </el-table-column>
     </el-table>
     <el-pagination
@@ -109,8 +122,7 @@ export default {
       pageSize: 10,
       totalPage: 0,
       dataListLoading: false,
-      dataListSelections: [],
-      optionsModel: []
+      dataListSelections: []
     }
   },
   methods: {
@@ -165,6 +177,10 @@ export default {
     // 多选
     selectionChangeHandle (val) {
       this.dataListSelections = val
+    },
+    // 详情
+    detailHandle (row) {
+      // todo
     }
   }
 }

src/views/modules/device/device-list.vue

@@ -2,10 +2,10 @@
   <div class="device">
     <template v-if="!addOrUpdateVisible && !detailVisible && !historyVisible">
       <!-- 查询、新增操作 -->
-      <el-form-item label="名称/编号">
-        <el-input v-model="dataForm.name" placeholder="名称/编号" clearable/>
-      </el-form-item>
       <el-form :inline="true" :model="dataForm" @keyup.enter.native="search()">
+        <el-form-item label="名称/编号">
+          <el-input v-model="dataForm.name" placeholder="名称/编号" clearable/>
+        </el-form-item>
         <el-form-item label="设备状态">
           <el-select
             v-model="dataForm.state"