Commit 2931d88f authored by zhanglw's avatar zhanglw

修复降雨量计算错误等bug

parent cfa3425a
...@@ -5,11 +5,11 @@ ENV = 'development' ...@@ -5,11 +5,11 @@ ENV = 'development'
#VUE_APP_BASE_API = 'http://39.164.225.220:5002' #VUE_APP_BASE_API = 'http://39.164.225.220:5002'
#VUE_APP_LOCAL_API = 'http://39.164.225.220:5002' #VUE_APP_LOCAL_API = 'http://39.164.225.220:5002'
#VUE_APP_BASE_API = 'http://192.168.3.23:9092' VUE_APP_BASE_API = 'http://192.168.3.23:9092'
#VUE_APP_LOCAL_API = 'http://192.168.3.23:9092' VUE_APP_LOCAL_API = 'http://192.168.3.23:9092'
VUE_APP_BASE_API = 'http://192.168.3.216:9092' #VUE_APP_BASE_API = 'http://192.168.3.216:9092'
VUE_APP_LOCAL_API = 'http://192.168.3.216:9092' #VUE_APP_LOCAL_API = 'http://192.168.3.216:9092'
VUE_APP_LOCAL_API2 = 'http://8.143.203.103:9091/' VUE_APP_LOCAL_API2 = 'http://8.143.203.103:9091/'
VUE_APP_WS_API = 'ws://8.143.203.103:9092/webSocket' VUE_APP_WS_API = 'ws://8.143.203.103:9092/webSocket'
......
...@@ -49,8 +49,8 @@ ...@@ -49,8 +49,8 @@
<el-table-column prop="time" label="报警时间" align="center"></el-table-column> <el-table-column prop="time" label="报警时间" align="center"></el-table-column>
<el-table-column label="报警类型" align="center"> <el-table-column label="报警类型" align="center">
<template slot-scope="scope"> <template slot-scope="scope">
<span v-show="scope.row.alarmtype===1">人员求救</span> <span v-show="scope.row.alarmtype===1">电子围栏</span>
<span v-show="scope.row.alarmtype===2">电子围栏</span> <span v-show="scope.row.alarmtype===2">人员求救</span>
<span v-show="scope.row.alarmtype===3">电池欠压</span> <span v-show="scope.row.alarmtype===3">电池欠压</span>
</template> </template>
</el-table-column> </el-table-column>
...@@ -113,8 +113,8 @@ export default { ...@@ -113,8 +113,8 @@ export default {
graphicLayer: null, graphicLayer: null,
stuOpts: [ stuOpts: [
{label: '全部', value: undefined}, {label: '全部', value: undefined},
{label: '人员求救', value: 1}, {label: '电子围栏', value: 1},
{label: '电子围栏', value: 2}, {label: '人员求救', value: 2},
{label: '电池欠压', value: 3}, {label: '电池欠压', value: 3},
], ],
tableData: [], tableData: [],
......
...@@ -39,7 +39,8 @@ ...@@ -39,7 +39,8 @@
<el-table :data="tableData" v-loading="loading" border style="width:auto" :row-class-name="tableRowClassName"> <el-table :data="tableData" v-loading="loading" border style="width:auto" :row-class-name="tableRowClassName">
<el-table-column prop="sensorname" label="设备名称" align="center"></el-table-column> <el-table-column prop="sensorname" label="设备名称" align="center"></el-table-column>
<el-table-column prop="sensorid" label="设备编号" align="center"></el-table-column> <el-table-column prop="sensorid" label="设备编号" align="center"></el-table-column>
<el-table-column prop="zongliang" label="检测值" align="center"></el-table-column> <el-table-column prop="rainfall" label="检测值" align="center"></el-table-column>
<el-table-column prop="zongliang" label="总计量" align="center"></el-table-column>
<el-table-column label="单位" align="center"> <el-table-column label="单位" align="center">
<template slot-scope="scope"> <template slot-scope="scope">
mm mm
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment