|
@@ -40,13 +40,13 @@
|
|
|
size="small"
|
|
size="small"
|
|
|
clearable
|
|
clearable
|
|
|
v-model="keyword"
|
|
v-model="keyword"
|
|
|
- @change="handleChange"
|
|
|
|
|
|
|
+ @input="handleChange"
|
|
|
>
|
|
>
|
|
|
</el-input>
|
|
</el-input>
|
|
|
</div>
|
|
</div>
|
|
|
</div>
|
|
</div>
|
|
|
<!-- 实时监测表格区域 -->
|
|
<!-- 实时监测表格区域 -->
|
|
|
- <div class="watch-form">
|
|
|
|
|
|
|
+ <div class="watch-form" v-if="tableData.length">
|
|
|
<el-table
|
|
<el-table
|
|
|
v-loading="loading"
|
|
v-loading="loading"
|
|
|
element-loading-text="加载中"
|
|
element-loading-text="加载中"
|
|
@@ -187,6 +187,8 @@ export default {
|
|
|
pop_imgurl: null,
|
|
pop_imgurl: null,
|
|
|
// 实时监测表格加载中效果
|
|
// 实时监测表格加载中效果
|
|
|
loading: false,
|
|
loading: false,
|
|
|
|
|
+ // 数据总条数
|
|
|
|
|
+ total: 0,
|
|
|
};
|
|
};
|
|
|
},
|
|
},
|
|
|
created() {
|
|
created() {
|
|
@@ -214,18 +216,18 @@ export default {
|
|
|
async getData() {
|
|
async getData() {
|
|
|
this.loading = true;
|
|
this.loading = true;
|
|
|
let res = await this.$axios({
|
|
let res = await this.$axios({
|
|
|
- url: "/accessRecord/access/record/realTime",
|
|
|
|
|
|
|
+ url: "/studentsportrait/accessRecord/access/record/realTime",
|
|
|
method: "get",
|
|
method: "get",
|
|
|
params: {
|
|
params: {
|
|
|
page: this.page,
|
|
page: this.page,
|
|
|
- // size: null,
|
|
|
|
|
dateTime: this.timeValue,
|
|
dateTime: this.timeValue,
|
|
|
keyWord: this.keyword,
|
|
keyWord: this.keyword,
|
|
|
},
|
|
},
|
|
|
});
|
|
});
|
|
|
// console.log(res);
|
|
// console.log(res);
|
|
|
if (res.data.status == 20001) {
|
|
if (res.data.status == 20001) {
|
|
|
- this.tableData = [...this.tableData, ...res.data.data];
|
|
|
|
|
|
|
+ this.total = res.data.data.totalCount;
|
|
|
|
|
+ this.tableData = [...this.tableData, ...res.data.data.list];
|
|
|
} else {
|
|
} else {
|
|
|
this.$message.error(res.data.desc);
|
|
this.$message.error(res.data.desc);
|
|
|
}
|
|
}
|
|
@@ -234,7 +236,7 @@ export default {
|
|
|
// 获取人员比例数据
|
|
// 获取人员比例数据
|
|
|
async getRatioData() {
|
|
async getRatioData() {
|
|
|
let res = await this.$axios({
|
|
let res = await this.$axios({
|
|
|
- url: "/accessRecord/access/record/ratios",
|
|
|
|
|
|
|
+ url: "/studentsportrait/accessRecord/access/record/ratios",
|
|
|
method: "get",
|
|
method: "get",
|
|
|
});
|
|
});
|
|
|
// console.log(res);
|
|
// console.log(res);
|
|
@@ -247,7 +249,7 @@ export default {
|
|
|
// 获取7小时人流量数据
|
|
// 获取7小时人流量数据
|
|
|
async getTrafficData() {
|
|
async getTrafficData() {
|
|
|
let res = await this.$axios({
|
|
let res = await this.$axios({
|
|
|
- url: "/accessRecord/access/record/traffic",
|
|
|
|
|
|
|
+ url: "/studentsportrait/accessRecord/access/record/traffic",
|
|
|
method: "get",
|
|
method: "get",
|
|
|
});
|
|
});
|
|
|
// console.log(res);
|
|
// console.log(res);
|
|
@@ -270,8 +272,10 @@ export default {
|
|
|
},
|
|
},
|
|
|
// 实时监测表格滑动到底部加载更多回调
|
|
// 实时监测表格滑动到底部加载更多回调
|
|
|
moretable() {
|
|
moretable() {
|
|
|
- this.page += 1;
|
|
|
|
|
- this.getData();
|
|
|
|
|
|
|
+ if (this.tableData.length < this.total) {
|
|
|
|
|
+ this.page += 1;
|
|
|
|
|
+ this.getData();
|
|
|
|
|
+ }
|
|
|
},
|
|
},
|
|
|
// 创建折线图
|
|
// 创建折线图
|
|
|
getLineChart() {
|
|
getLineChart() {
|