From 59da8ccf452d13ebb007739c67f45cc5e2ed1972 Mon Sep 17 00:00:00 2001
From: batman <978517621@qq.com>
Date: Mon, 13 Mar 2023 13:03:49 +0800
Subject: [PATCH] 用户管理修改展示
---
src/views/intellectInspect/intelligentLine/index.vue | 98 +++++++++++++++++++++++++++++++++++++++++++-----
1 files changed, 87 insertions(+), 11 deletions(-)
diff --git a/src/views/intellectInspect/intelligentLine/index.vue b/src/views/intellectInspect/intelligentLine/index.vue
index ae41abf..d9b1a5c 100644
--- a/src/views/intellectInspect/intelligentLine/index.vue
+++ b/src/views/intellectInspect/intelligentLine/index.vue
@@ -3,16 +3,16 @@
<div class="big-title" @click="goBack()">国泰新华智能巡检系统</div>
<div style="height: 20px;font-size: 14px;line-height: 20px; color: #00ffff; margin-top: 4px">{{ present }}</div>
<div class="btns">
-<!-- <div class="fullbtn" @click="onScreenfullClick">-->
-<!-- <div class="toFull">-->
-<!-- <i class="iconfont" :title="全屏" :class="!isScreenfull ? 'icon-fullscreen' : 'icon-tuichuquanping'"></i>-->
+ <div class="fullbtn" @click="onScreenfullClick">
+ <div class="toFull">
+ <i class="iconfont" :title="全屏" :class="!isScreenfull ? 'icon-fullscreen' : 'icon-tuichuquanping'"></i>
<!-- <el-icon>-->
<!-- <FullScreen v-if="isScreenfull"/>-->
<!-- <Close v-else/>-->
<!-- </el-icon>-->
-<!-- </div>-->
-<!-- <div>全屏</div>-->
-<!-- </div>-->
+ </div>
+ <div>全屏</div>
+ </div>
<div class="backBtn" @click="goBack()">
<img src="../../../assets/loginPage/back-icon.png"/>
<div>退出</div>
@@ -20,6 +20,36 @@
</div>
<div class="blocks">
<div>
+ <div class="warning-part">
+ <div class="warn-tit">异常警报：</div>
+ <div class="warn-msg" v-if="excepOrder && excepOrder.length>0">
+ <div class="warn-item" v-for="(item,index) in excepOrder" :key="index">
+ <div class="i-tit">
+ 编号{{item.pointCode}} 巡检异常！
+ </div>
+ <div v-if="item.dataReportType == 2 || item.dataReportType == 3">
+ 正常值：<span>{{(item.secondReferenceSign==1?'>':'>=') + item.secondReferenceValue + ',' + (item.thirdReferenceSign==3?'<':'<=') + item.thirdReferenceValue}}</span>
+ </div>
+ <div>
+ 巡检值：
+ <span v-if="item.dataReportType == 1">{{ item.firstReferenceResult==1?'正常':item.firstReferenceResult==2?'异常':'备'}}</span>
+ <span v-if="item.dataReportType == 2">{{ item.secondReferenceResult}}</span>
+ </div>
+ <div>
+ 已通知负责人：<span>{{item.hiddenDangerHandlerName}}</span>
+ </div>
+ <div>
+ 负责人电话：<span>{{item.hiddenDangerHandlerPhone}}</span>
+ </div>
+ <div>
+ 工单回执状态：<span>{{item.handlerStatus==1?'待响应':item.handlerStatus==2?'标记误报':item.handlerStatus==3?'自查处理中':item.handlerStatus==4?'已移交上报':item.handlerStatus==5?'待验收':'已完成'}}</span>
+ </div>
+ </div>
+ </div>
+ <div v-else>
+ 暂无异常警报
+ </div>
+ </div>
<div class="star-pic">
<dv-decoration-12 scanDur="5" haloDur="4" class="scan"/>
<div class="star-bg"><img src="../../../assets/loginPage/star-bg.png" /></div>
@@ -109,6 +139,7 @@
socket: any;
socketData: string;
data: Array<any>;
+ excepOrder: Array<any>;
id: string;
defaultImg: string
}
@@ -125,6 +156,7 @@
socketData: '',
socket: null,
data: [],
+ excepOrder: [],
id: '',
defaultImg: new URL('../../../assets/default-img.jpg',import.meta.url).href
});
@@ -136,7 +168,7 @@
let curId = route.query.id
state.id = curId.toString()
getLine(state.id)
- getUrl(state.id)
+ // getUrl(state.id)
});
onActivated(()=>{
onScreenfullClick();
@@ -158,9 +190,7 @@
// 实例化socket
let uid = userInfos.value.uid.toString()
var url = state.path + uid + '*' + id;
- console.log(url,'url',uid,'uid')
url = url.replace('https', 'ws').replace('http', 'ws');
- console.log(url, '获取地址');
state.socket = new WebSocket(url);
// 监听socket连接
state.socket.onopen = () => {
@@ -173,7 +203,6 @@
// 监听socket消息
state.socket.onmessage = (msg) => {
if (msg.data === '连接成功') return;
- console.log(msg.data,'data')
userInfos.value.dataList = JSON.parse(msg.data);
};
}
@@ -193,7 +222,12 @@
const getLine = async (id:string) => {
let res = await lineApi().getLine({ id: id });
if (res.data.code === '200') {
- userInfos.value.dataList = res.data.data
+ userInfos.value.dataList = res.data.data.rfidInfos
+ if(res.data.data.excepOrder){
+ state.excepOrder = res.data.data.excepOrder
+ }else{
+ state.excepOrder = []
+ }
} else {
ElMessage({
type: 'warning',
@@ -1360,6 +1394,48 @@
}
}
}
+ .warning-part{
+ position: absolute;
+ width: calc((100vw - 120px) / 7);
+ height: calc((100vw - 120px) / 7);
+ background-image: linear-gradient(to right, rgba(8, 109, 209, 0.4), rgba(11, 255, 255, 0.2));
+ border: 1px solid #36fcfc;
+ z-index: 99999;
+ top: 100px;
+ right: 60px;
+ padding: 10px;
+ color: rgb(0, 255, 255);
+
+ .warn-tit{
+ height: 26px;
+ padding-bottom: 5px;
+ font-weight: bolder;
+ border-bottom: 1px solid rgb(0, 255, 255);
+ }
+ .warn-msg{
+ width: 100%;
+ margin-top: 10px;
+ height: calc(100% - 36px);
+ overflow: hidden;
+ overflow-y: scroll;
+ scrollbar-width: none; /* firefox */
+ -ms-overflow-style: none; /* IE 10+ */
+
+ &::-webkit-scrollbar {
+ display: none; /* Chrome Safari */
+ }
+ .warn-item{
+ padding: 0 0 10px;
+ margin-bottom: 10px;
+ border-bottom: 1px solid rgb(0, 255, 255);
+
+ &:last-of-type{
+ border-bottom: none;
+ margin-bottom: 0;
+ }
+ }
+ }
+ }
.star-pic {
position: absolute;
width: calc((100vw - 120px) / 7);
--
Gitblit v1.9.2