Commit 023de4a4 authored by xxx's avatar xxx

修改

parent 2dea6f2b
...@@ -2,10 +2,10 @@ ENV = 'development' ...@@ -2,10 +2,10 @@ ENV = 'development'
# 接口地址 # 接口地址
#VUE_APP_BASE_API = 'http://localhost:8000' #VUE_APP_BASE_API = 'http://localhost:8000'
VUE_APP_BASE_API = 'http://192.168.0.111:9090' VUE_APP_BASE_API = 'http://192.168.0.108:8001'
VUE_APP_WS_API = 'ws://8.143.203.103:9090/webSocket' VUE_APP_WS_API = 'ws://8.143.203.103:9090/webSocket'
VUE_APP_LOCAL_API = 'http://192.168.0.111:9090' VUE_APP_LOCAL_API = 'http://192.168.0.108:8001'
VUE_APP_LOCAL_API2 = 'http://192.168.0.111:9090' VUE_APP_LOCAL_API2 = 'http://192.168.0.108:8001'
# 是否启用 babel-plugin-dynamic-import-node插件 # 是否启用 babel-plugin-dynamic-import-node插件
VUE_CLI_BABEL_TRANSPILE_MODULES = true VUE_CLI_BABEL_TRANSPILE_MODULES = true
...@@ -23,7 +23,7 @@ ...@@ -23,7 +23,7 @@
<!-- <el-button size="mini" type="primary" icon="el-icon-plus" @click="toAdd">新增</el-button> --> <!-- <el-button size="mini" type="primary" icon="el-icon-plus" @click="toAdd">新增</el-button> -->
</div> </div>
<div class="content"> <div class="content">
<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" height="64vh">
<el-table-column prop="name" label="设备编号" align="center"></el-table-column> <el-table-column prop="name" label="设备编号" align="center"></el-table-column>
<el-table-column prop="alarmTime" label="报警时间" align="center"></el-table-column> <el-table-column prop="alarmTime" label="报警时间" align="center"></el-table-column>
<el-table-column prop="type" label="报警类型" align="center" :formatter="baojingleixingChange"></el-table-column> <el-table-column prop="type" label="报警类型" align="center" :formatter="baojingleixingChange"></el-table-column>
...@@ -120,10 +120,7 @@ export default { ...@@ -120,10 +120,7 @@ export default {
} }
}, },
mounted() { mounted() {
var that = this; this.loadData();
this.$nextTick(() => {
this.loadData();
})
}, },
methods: { methods: {
loadData() { loadData() {
...@@ -137,8 +134,8 @@ export default { ...@@ -137,8 +134,8 @@ export default {
//获取报警信息 //获取报警信息
HttpReq.truckDispatching.callPoliceHistroyQuery(param).then((res) => { HttpReq.truckDispatching.callPoliceHistroyQuery(param).then((res) => {
this.loading = false; this.loading = false;
this.tableData = res; this.tableData = res.content;
this.total = res.length; this.total = res.totalElements;
}) })
}) })
......
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