init

src/views/Equipment/state.vue

@@ -212,32 +212,47 @@
         style="width: 100%"
       >
         <el-table-column type="selection" width="55"> </el-table-column>
-        <el-table-column prop="date" label="序号" align="center">
+        <el-table-column type="index" label="序号" align="center">
         </el-table-column>
-        <el-table-column prop="name" label="设备编号" align="center">
+        <el-table-column prop="imei" label="设备编号" align="center">
         </el-table-column>
-        <el-table-column prop="name" label="楼盘" align="center">
+        <el-table-column prop="houseName" label="楼盘" align="center">
         </el-table-column>
-        <el-table-column prop="name" label="领用人" align="center">
+        <el-table-column prop="userName" label="领用人" align="center">
         </el-table-column>
-        <el-table-column prop="address" label="在线状态" align="center">
+        <el-table-column prop="onLine" label="在线状态" align="center">
+          <template slot-scope="{row}">
+            {{row.onLine==1?'在线':'离线'}}
+          </template>
         </el-table-column>
         <el-table-column prop="date" label="离线天数" align="center">
         </el-table-column>
-        <el-table-column prop="name" label="录音状态" align="center">
+        <el-table-column prop="simAudioStatus" label="录音状态" align="center">
+                    <template slot-scope="{row}">
+            {{row.simAudioStatus?'开启':'关闭'}}
+          </template>
         </el-table-column>
-        <el-table-column prop="name" label="上传状态" align="center">
+        <el-table-column prop="simAudioUploadStatus" label="上传状态" align="center">
+                              <template slot-scope="{row}">
+            {{row.simAudioUploadStatus?'上传中':'无上传'}}
+          </template>
         </el-table-column>
-        <el-table-column prop="name" label="开机指示灯" align="center">
+        <el-table-column prop="lightStatus" label="开机指示灯" align="center">
+                                        <template slot-scope="{row}">
+            {{row.lightStatus=='on'?'开启':'关闭'}}
+          </template>
         </el-table-column>
 
-        <el-table-column prop="name" label="电池电量" align="center">
+        <el-table-column prop="name" label="电池电量" width="200" align="center">
+          <template slot-scope="{ row }">
+            <el-progress :percentage="80" :color="customColors"></el-progress>
+          </template>
         </el-table-column>
-        <el-table-column prop="name" label="信号强度" align="center">
+        <el-table-column prop="signalDevice" label="信号强度" align="center">
         </el-table-column>
         <el-table-column prop="name" label="待上传文件" align="center">
         </el-table-column>
-        <el-table-column prop="name" label="更新时间" align="center">
+        <el-table-column width="150" prop="updateTime" label="更新时间" align="center">
         </el-table-column>
         <el-table-column prop="name" label="开机时间" align="center">
         </el-table-column>

vue.config.js

@@ -4,8 +4,8 @@
  */
 // const url = 'http://pigx-gateway'
 // const url = 'http://39.97.167.65:9999' //测试
-// const url = 'http://192.168.31.160:9999' //长龙
-const url = 'http://192.168.31.133:9999' //嘉豪
+const url = 'http://192.168.31.160:9999' //长龙
+// const url = 'http://192.168.31.133:9999' //嘉豪
 // const url = 'http://192.168.31.100:9999' //王笑
 
 const CompressionWebpackPlugin = require('compression-webpack-plugin')