From ab9326dd1e6a029d1277d04876b946a3bf22ecaf Mon Sep 17 00:00:00 2001 From: jinna Date: Wed, 20 Aug 2025 18:09:41 +0800 Subject: [PATCH] =?UTF-8?q?=E6=8A=A5=E8=AD=A6=E5=8A=9F=E8=83=BD=E6=B7=BB?= =?UTF-8?q?=E5=8A=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- public/img/tuobu/door_error.png | Bin 0 -> 2821 bytes public/img/tuobu/door_success.png | Bin 0 -> 2795 bytes src/App.vue | 43 +++++++++++++-- src/api/opsVisualization/alarmProcess.js | 6 ++- src/api/opsVisualization/serviceDataOAM.js | 9 ++-- src/api/opsVisualization/systemMonitoring.js | 9 ++-- src/api/opsVisualization/tuobu.js | 11 +++- src/components/monitoring/door.vue | 21 ++++++-- .../systemMonitoring/index.vue | 2 +- src/page/opsVisualization/tuobu.vue | 51 +++++++++++++++++- src/views/equipment/doorRecord.vue | 4 ++ 11 files changed, 138 insertions(+), 18 deletions(-) create mode 100644 public/img/tuobu/door_error.png create mode 100644 public/img/tuobu/door_success.png diff --git a/public/img/tuobu/door_error.png b/public/img/tuobu/door_error.png new file mode 100644 index 0000000000000000000000000000000000000000..b8ebf65414e5e2c3fc992449aa6cc69d722ec9eb GIT binary patch literal 2821 zcmV+g3;OhlP)PxlJ6hk@+re|30S*%Qj|3cCq15v_ z#Ex6m`wYg@I<|4yhyc1pmarR+vpY9BIvgg{q-pJE;Qe8Iqwo;{ghjDS;%BR!u&l2U zV`tcAbn7Pq2#6qqA0_4=gniqvaCt_Kfk!kMF1WM>+H6*bANgD>TG6U@S{ZhAuyH!SPI~pxXBC? zUj)zrwV>pmTD59%b#U+&X8IrzZVf}meE5g}+Mw=|KS+GbQlhpY+HdX9jNezpvpBk&6V zy~>1F2$*IE?@Gc@Ap&S%kAbK2%D&l;P`BLgs1<-|BJ3rH_N^E#|Gr(!O0l?}DDwb= zwd!n+;SN=PZS^}6Cjw|d&;Z}OLMh+PnTl!s6~Ouq;7@_D2Zr&h+{nmLKZ0BlfDAWY z;E&Ek)laA*fHz>LJvmjr-H(NeWjzMQwhnfG9su9DT&ZJzaT?3R?plffe7+qV1Xu_B zo`O=(c@Z~hSr0Jdn{90fyK}bvnIOc^+E$9zk3jfhP+t*1bOLxWr|j#!2smMyLk8%1 z0o$#6iq=aYtP}w>AfR(kpx^xfx*33gpJbK&InSrRXg$n?FSOWn@#NPglOdme z*HfQY^-AN5D|t57-Hb9I=-E3Bm+c{0T{eL zuaxJ0{Df&8CSYw75eIV0_C3lqzIydiV_?B!0B-Dt>~_8)fCvOY;D@qGeWepQm9=YE zqv{-KdHO;3WmS2H7pW7bSs>7fsEMDACjy8@0H4n)_2Z5LFwHFhJ=Id4F>df$=$SIj zH(vk^yQy9Ta0LOauS~n_pOdvGhrU_!o`k?%IA{*-N~Lor_H($p8^# zfN7_iT{$*(vf~?oWqp+x-)}6}1b!628qKHwlmq^mL3D;3nyQjBwea$SGylTtQ#Twv zdPy@zPnabx0}N)2CCf%e&UG9D+PtSTcvoJjyE|r$QYmjZ?7y8%*hkF2&MMV9#PkH6 z!5f)40TAf!tSayF5J2lH9bs?Iwm;#KH9ky?$2-2h5uQNRcrZIQ5^57DIPA&sNSpuw zoX;tHaXW}A#nQbX{$881^Tt4C~*#nLtqyDNpg^f`izahuM8m*!5TRsfDen+jv)tB!E#taT(<6=lbuO@(s#-$B|a z0%$->ce^?Wz;kKqw~XGdEh2zADkm*#xx+X$mxRSo*O8pEbr-v8)r$b?ER37xMg!z| z1T6-_q7M0bPT6k?5>x~*D}X-vXj)QQ}a>(;GwE>~ZQl6*Io2p}l}04^Y7tnYM~A+Fmy zMF7bWfZLL`+nAGU)^1?Kaj%1YyJP@81pF4`5;q5!ZIJur4kmiiVEp|uumt4f0FSEEzyDfMftU4{+sJxC{Y4IamiE zzwsx@=K*y3H`l{dnEL!UNbGB1n9g?NBXaY}?57HnJKpm}fLqpg8Z{ec<1OYFBw$J929q9f;5kLcr70Y_W<351| z^4-)V!i_oGel|!$Q!4-_d?at%zi9?*(lmd_pf3jjF$uO|Z#zk?0EqC*tZjd)9eESQ z(#H*hH^V_b3FLaUp-TKG5dEcK+Xuq5HMIh$fyK^-sD5-h4ERa#Nw)w9`*OB@TM~$v zuQsGx050l;eGbvRg>rdfzDStQdPM*;=ua@yPR?L&&^vbKle{SE76Dw1;(34{cMM}! zpihKL>ZeLh50 zH5U;;Sma{z69L2oY_EhB0rUz}F||_!5EHPy5>^DzD@?`IP7y#%!1hX55kRjn6;nG! z05JjED`72GBzjoz@dq6wD*#ytm ztO#R;$uqXsLD@k9V=WWAx!A^;JgA^;fz(yW0*X83!)=cN zw_P(;U1@jCcP3CRW@G%>#=7;k^mo?Q^{Y49wV%b~N*`-|ZtZW~*6q;@E;D${wE+GP X_b+h>5xLs000000NkvXXu0mjftGXlY literal 0 HcmV?d00001 diff --git a/public/img/tuobu/door_success.png b/public/img/tuobu/door_success.png new file mode 100644 index 0000000000000000000000000000000000000000..33b88e79608f04cbe6608e1d23c235badd4d214d GIT binary patch literal 2795 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 + + 门禁软件存在问题，请尽快处理！ + + 取 消 + 确 定 + + 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" ? '门禁软件监控' : '监控'}}
告警详情 +
+ + +
门禁
+
+ + 门禁软件存在问题，请尽快处理！ + + 取 消 + 确 定 + +