Commit 3228af12 authored by xinzhedeai's avatar xinzhedeai

历史数据添加设备名称和安装位置

parent 373b51df
...@@ -140,7 +140,9 @@ ...@@ -140,7 +140,9 @@
<!-- <el-table-column type="selection" width="55" align="center" /> <!-- <el-table-column type="selection" width="55" align="center" />
<el-table-column label="主键,自增" align="center" prop="id" /> --> <el-table-column label="主键,自增" align="center" prop="id" /> -->
<el-table-column label="设备编号" align="center" prop="sensorid" /> <el-table-column label="设备编号" align="center" prop="sensorid" />
<el-table-column label="监测类型" align="center" prop="item" /> <el-table-column label="设备名称" align="center" prop="equipname" />
<!-- <el-table-column label="监测类型" align="center" prop="item" /> -->
<el-table-column label="测量时间 " align="center" prop="time" width="180"> <el-table-column label="测量时间 " align="center" prop="time" width="180">
<template slot-scope="scope"> <template slot-scope="scope">
<span>{{ parseTime(scope.row.time) }}</span> <span>{{ parseTime(scope.row.time) }}</span>
...@@ -154,6 +156,7 @@ ...@@ -154,6 +156,7 @@
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="报警级别" align="center" prop="bjjb" /> <el-table-column label="报警级别" align="center" prop="bjjb" />
<el-table-column label="设备安装位置" align="center" prop="installationlocate" />
<!-- <el-table-column label="创建时间" align="center" prop="createtime" width="180"> <!-- <el-table-column label="创建时间" align="center" prop="createtime" width="180">
<template slot-scope="scope"> <template slot-scope="scope">
<span>{{ parseTime(scope.row.createtime) }}</span> <span>{{ parseTime(scope.row.createtime) }}</span>
......
...@@ -34,7 +34,10 @@ module.exports = { ...@@ -34,7 +34,10 @@ module.exports = {
open: true, open: true,
proxy: { proxy: {
[process.env.VUE_APP_BASE_API]: { [process.env.VUE_APP_BASE_API]: {
target: `http://192.168.0.103:8085/lswz`, // 线上内网
target: `http://192.168.113.100:8001/lswz`, // 青海线上内网
// target: `http://192.168.0.103:8085/lswz`, // 线上内网
// target: `http://192.168.2.18:8085/lswz`, // 毕广建
// target: `http://192.168.3.188:8085/lswz`, // target: `http://192.168.3.188:8085/lswz`,
//target: `http://192.168.3.37:8085/lswz`, //target: `http://192.168.3.37:8085/lswz`,
// target: `http://10.50.70.100:8085/lswz`, // target: `http://10.50.70.100:8085/lswz`,
......
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