diff --git a/public/img/tuobu/door_error.png b/public/img/tuobu/door_error.png
new file mode 100644
index 0000000..b8ebf65
Binary files /dev/null and b/public/img/tuobu/door_error.png differ
diff --git a/public/img/tuobu/door_success.png b/public/img/tuobu/door_success.png
new file mode 100644
index 0000000..33b88e7
Binary files /dev/null and b/public/img/tuobu/door_success.png differ
diff --git a/src/App.vue b/src/App.vue
index e024033..be261fc 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -4,20 +4,57 @@
+
+ 门禁软件存在问题,请尽快处理!
+
+
diff --git a/src/api/opsVisualization/alarmProcess.js b/src/api/opsVisualization/alarmProcess.js
index ba4380b..95454b3 100644
--- a/src/api/opsVisualization/alarmProcess.js
+++ b/src/api/opsVisualization/alarmProcess.js
@@ -3,7 +3,8 @@ import request from '@/router/axios';
//设备类型通讯链路及排除方案
export const getWarnPoint = (params) => {
return request({
- url: '/kgApi/monitor-business/getWarnPoint',
+ url: '/kgApi/monitor-business/getWarnPoint', //单独部署监控管理时使用此url
+ // url: '/monitor-business/getWarnPoint',
method: 'get',
params
})
@@ -11,7 +12,8 @@ export const getWarnPoint = (params) => {
//排查方案信息列表
export const getResolveTips = (params) => {
return request({
- url: '/kgApi/monitor-business/getResolveTips',
+ url: '/kgApi/monitor-business/getResolveTips', //单独部署监控管理时使用此url
+ // url: '/monitor-business/getResolveTips',
method: 'get',
params
})
diff --git a/src/api/opsVisualization/serviceDataOAM.js b/src/api/opsVisualization/serviceDataOAM.js
index 1f51a2f..7dd8315 100644
--- a/src/api/opsVisualization/serviceDataOAM.js
+++ b/src/api/opsVisualization/serviceDataOAM.js
@@ -2,7 +2,8 @@ import request from '@/router/axios';
//报警设备列表
export const getEquipList = (params) => {
return request({
- url: '/kgApi/monitor-business/getEquipList',
+ // url: '/kgApi/monitor-business/getEquipList',
+ url: '/monitor-business/getEquipList',
method: 'get',
params
})
@@ -10,7 +11,8 @@ export const getEquipList = (params) => {
//当前报警信息
export const getWarnMsg = (params) => {
return request({
- url: '/kgApi/monitor-business/getWarnMsg',
+ url: '/kgApi/monitor-business/getWarnMsg',
+ // url: '/monitor-business/getWarnMsg',
method: 'get',
params
})
@@ -18,7 +20,8 @@ export const getWarnMsg = (params) => {
//报警记录
export const getWarnHisList = (params) => {
return request({
- url: '/kgApi/monitor-business/getWarnHisList',
+ url: '/kgApi/monitor-business/getWarnHisList',
+ // url: '/monitor-business/getWarnHisList',
method: 'get',
params
})
diff --git a/src/api/opsVisualization/systemMonitoring.js b/src/api/opsVisualization/systemMonitoring.js
index 3d0ceb7..1249bdc 100644
--- a/src/api/opsVisualization/systemMonitoring.js
+++ b/src/api/opsVisualization/systemMonitoring.js
@@ -2,19 +2,22 @@ import request from '@/router/axios';
export const getServiceList = () => {
return request({
- url: '/kgApi/monitor-system/getServiceList',
+ url: '/kgApi/monitor-system/getServiceList',
+ // url: '/monitor-system/getServiceList',
method: 'get',
})
}
export const getMiddleList = () => {
return request({
- url: '/kgApi/monitor-system/getMiddleList',
+ url: '/kgApi/monitor-system/getMiddleList',
+ // url: '/monitor-system/getMiddleList',
method: 'get',
})
}
export const getServerParamsList = () => {
return request({
- url: '/kgApi/monitor-system/getServerParamsList',
+ url: '/kgApi/monitor-system/getServerParamsList',
+ // url: '/monitor-system/getServerParamsList',
method: 'get',
})
}
diff --git a/src/api/opsVisualization/tuobu.js b/src/api/opsVisualization/tuobu.js
index 9716e0d..d3261d0 100644
--- a/src/api/opsVisualization/tuobu.js
+++ b/src/api/opsVisualization/tuobu.js
@@ -2,7 +2,16 @@ import request from '@/router/axios';
export const getMonitorList = () => {
return request({
- url: '/kgApi/monitor-system/getMonitorList',
+ url: '/kgApi/monitor-system/getMonitorList',
+ // url: '/monitor-system/getMonitorList',
method: 'get',
})
}
+
+export const getDoorStatus = () =>{
+ return request({
+ url:'/kgApi/monitor-system/checkSysSoftware',
+ // url:'/monitor-system/checkSysSoftware',
+ method:'get'
+ })
+}
diff --git a/src/components/monitoring/door.vue b/src/components/monitoring/door.vue
index 0260fab..2ffa626 100644
--- a/src/components/monitoring/door.vue
+++ b/src/components/monitoring/door.vue
@@ -350,7 +350,7 @@
@@ -687,6 +687,9 @@ export default {
window["handleDetail"] = () => {
this.handleDetail()
};
+ window["handleTurn"] = () => {
+ this.handleTurn()
+ };
},
mounted() {
let dom = document.getElementById('door_box');
@@ -925,6 +928,7 @@ export default {
if (this.doorName) {
this.isSearch = true;
bfHelper.clearTags();
+ this.doorName1 = this.doorName
getDoorJcjl(
this.bimModel,
null,
@@ -963,7 +967,7 @@ export default {
this.current1,
this.size,
this.userName,
- this.doorName,
+ this.doorName1,
null
).then((res) => {
this.searchLists = res.data.data.records;
@@ -979,11 +983,13 @@ export default {
// 点击报警信息定位到指定设备
bjClick(item) {
this.dialogItem = item
+ console.log('dialogItem=======================================',this.dialogItem)
//
bfHelper.clearDrawableContainer();
let id = bfHelper.disposeId(item.area, item.build, item.modelId);
let box = bfHelper.getBoxMessage(id, true);
- if (box == "undefined") {
+ console.log('box------------------------',box)
+ if (box == "undefined" || box == undefined) {
this.$message.error('对不起,暂无该设备模型,请稍后点击');
return;
}
@@ -1146,6 +1152,7 @@ export default {
+
@@ -1153,10 +1160,15 @@ export default {
return content;
},
handleDetail() {
+ console.log('进入此方法')
// this.$router.push(`/equipment/operationDetails?code=${this.dialogItem.code}&type=电子门禁&area=${this.bimModel}`)
const routerUrl = this.$router.resolve({ path: '/equipment/operationDetails', query: { code: this.dialogItem.code,type:'电子门禁',area: this.bimModel} });
window.open(routerUrl.href, "_blank");
},
+ handleTurn(){
+ const routerUrl = this.$router.resolve({ path: '/equipment/doorRecord', query: { name: this.dialogItem.name,type:'电子门禁',area: this.bimModel} });
+ window.open(routerUrl.href, "_blank");
+ },
doorCustom(item) {
setTimeout(() => {
document.getElementById("pass-user").addEventListener("scroll", (e) => {
@@ -1253,11 +1265,12 @@ export default {
this.current1,
this.size,
null,
- this.doorName,
+ this.doorName1,
null
).then((res) => {
this.searchLists = res.data.data.records;
this.total1 = res.data.data.total; //总条目数
+ this.$forceUpdate()
});
},
// 定义表格的头部样式
diff --git a/src/page/opsVisualization/systemMonitoring/index.vue b/src/page/opsVisualization/systemMonitoring/index.vue
index a2415c9..5de463b 100644
--- a/src/page/opsVisualization/systemMonitoring/index.vue
+++ b/src/page/opsVisualization/systemMonitoring/index.vue
@@ -69,7 +69,7 @@
"
alt=""
/>
- {{ item.type == "redis" ? "Redis服务监控" : "数据库监控" }}
+ {{ item.type == "redis" ? "Redis服务监控" : item.type == "mysql" ? "数据库监控" : item.type == "software" ? '门禁软件监控' : '监控'}}
告警详情
+
+

+

+
门禁
+
+
+ 门禁软件存在问题,请尽快处理!
+
+