From 0f2b250ffdfe490b035e36b542f8e6a4b6ef8c4c Mon Sep 17 00:00:00 2001
From: zhangqun <179111901@qq.com>
Date: Thu, 21 Sep 2023 17:05:34 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BA=BA=E5=91=98=E5=AE=9A=E4=BD=8D=EF=BC=8C?=
=?UTF-8?q?=E5=9B=AD=E5=8C=BA=E7=8E=AF=E5=A2=83=E9=85=8D=E7=BD=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../wirelessintrusion/wirelessintrusion.js | 2 +-
src/views/alarmcenter/peopleposition/list.vue | 67 ++++++-------------
vocalldemo/index.html | 4 +-
vue.config.js | 4 +-
4 files changed, 25 insertions(+), 52 deletions(-)
diff --git a/src/api/wirelessintrusion/wirelessintrusion.js b/src/api/wirelessintrusion/wirelessintrusion.js
index 584250c..9b791da 100644
--- a/src/api/wirelessintrusion/wirelessintrusion.js
+++ b/src/api/wirelessintrusion/wirelessintrusion.js
@@ -1,6 +1,6 @@
import request from '@/router/axios';
-const baseUrl = process.env.NODE_ENV === 'production' ? 'http://182.139.182.190:60032/prod-api' : 'http://182.139.182.190:60032/prod-api';
+const baseUrl = process.env.NODE_ENV === 'production' ? 'http://171.16.8.58:8080/prod-api' : 'http://182.139.182.190:60032/prod-api';
//物联网登录
export const bizLogin = (data) => {
return request({
diff --git a/src/views/alarmcenter/peopleposition/list.vue b/src/views/alarmcenter/peopleposition/list.vue
index 31f117d..1ee7174 100644
--- a/src/views/alarmcenter/peopleposition/list.vue
+++ b/src/views/alarmcenter/peopleposition/list.vue
@@ -6,7 +6,7 @@
详情
- 地图定位
@@ -51,22 +51,22 @@ export default {
dialogClickModal: false,
menuWidth: 180,
column: [
- {
- label: "设备名称",
- prop: "name",
- },
{
label: "sn编号",
prop: "sn",
- search: true,
},
{
label: "姓名",
prop: "patientName",
+ search: true,
},
{
label: "性别",
prop: "sex",
+ type: "select",
+ dicData: [
+ { value: "1", label: "男" }, { value: '0', label: "女" }
+ ],
},
{
label: "科室",
@@ -74,48 +74,21 @@ export default {
},
{
label: "状态",
- type: "status",
+ type: "select",
dicData: [
- { value: 0, label: "在线" }, { value: 1, label: "离线" }
+ { value: 'alarm', label: "报警" }, { value: 'offLine', label: "离线" }, { value: 'onLine', label: "在线" }
],
- prop: "communicateStatus",
- },
- {
- label: "最后一次通信时间",
- labelWidth: 150,
- prop: "lastCommunicateTime",
- span: 24,
- formatter: (data, value) => {
- return dateFormat(new Date(data.lastCommunicateTime))
- },
- hide: true
+ prop: "status",
+ search: true,
},
{
- label: "最后一次配置时间",
- labelWidth: 150,
- prop: "lastConfigTime",
- span: 24,
- formatter: (data, value) => {
- return dateFormat(new Date(data.lastConfigTime))
- },
- hide: true
+ label: "年龄",
+ prop: "age",
},
{
- label: "入场时间",
- labelWidth: 150,
- prop: "admissionTime",
+ label: "手机号",
+ prop: "phone",
span: 24,
- formatter: (data, value) => {
- return dateFormat(new Date(data.lastLocateTime))
- },
- hide: true
- },
- {
- label: "出科室时间",
- prop: "outDepartmentTime",
- formatter: (data, value) => {
- return dateFormat(new Date(data.createTime))
- }
},
]
},
@@ -152,7 +125,7 @@ export default {
if (token == 'undefined' || !token) {
bizLogin({ appKey: 'Arf7bd4f26', appSecret: 'kb207044c8' }).then(res => {
window.sessionStorage.setItem('bizToken', res.data.data.token);
- terminalList(res.data.data.token, Object.assign(params, this.query, { page: page.currentPage, size: page.pageSize, buildingIds: this.buildingId, sn: row.sn })).then(res2 => {
+ terminalList(res.data.data.token, { page: 1, size: 1, buildingIds: this.buildingId, sn: row.sn }).then(res2 => {
if (res2.data.code == 401) {
window.sessionStorage.removeItem('bizToken');
this.rowMap(row, index)
@@ -174,7 +147,7 @@ export default {
})
}
else {
- terminalList(token, Object.assign(params, this.query, { page: page.currentPage, size: page.pageSize, buildingIds: this.buildingId, sn: row.sn })).then(res2 => {
+ terminalList(token, { page: 1, size: 1, buildingIds: this.buildingId, sn: row.sn }).then(res2 => {
if (res2.data.code == 401) {
window.sessionStorage.removeItem('bizToken');
this.rowMap(row, index);
@@ -236,8 +209,8 @@ export default {
}
else if (res2.data.code == 0) {
const data = res2.data.data;
- this.page.total = data.totalElements;
- this.data = data.content;
+ this.page.total = data.total;
+ this.data = data.records;
}
}, err => {
this.loading = false;
@@ -254,8 +227,8 @@ export default {
}
else if (res2.data.code == 0) {
const data = res2.data.data;
- this.page.total = data.totalElements;
- this.data = data.content;
+ this.page.total = data.total;
+ this.data = data.records;
}
}, err => {
this.loading = false;
diff --git a/vocalldemo/index.html b/vocalldemo/index.html
index 147afd1..9c3eb0d 100644
--- a/vocalldemo/index.html
+++ b/vocalldemo/index.html
@@ -253,8 +253,8 @@