From b6cacf34f55a6d53e3019ff0c886ff3a2335c066 Mon Sep 17 00:00:00 2001
From: batman <978517621@qq.com>
Date: 星期四, 16 三月 2023 10:30:55 +0800
Subject: [PATCH] 新修改添加页面
---
src/views/intellectInspect/intelligentLine/index.vue | 86 +++++++++++++++++++++----------------------
1 files changed, 42 insertions(+), 44 deletions(-)
diff --git a/src/views/intellectInspect/intelligentLine/index.vue b/src/views/intellectInspect/intelligentLine/index.vue
index af7fa8f..db88ff5 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>
@@ -22,47 +22,32 @@
<div>
<div class="warning-part">
<div class="warn-tit">异常警报：</div>
- <div class="warn-msg">
- <div class="warn-item">
+ <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">
- P-8240A 巡检异常！
+ 编号{{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>8-10Mpa</span>
+ 巡检值：
+ <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>12Mpa</span>
+ 已通知负责人：<span>{{item.hiddenDangerHandlerName}}</span>
</div>
<div>
- 已通知负责人：<span>黄公子</span>
+ 负责人电话：<span>{{item.hiddenDangerHandlerPhone}}</span>
</div>
<div>
- 负责人电话：<span>15261806176</span>
- </div>
- <div>
- 工单回执状态：<span>待响应</span>
+ 工单回执状态：<span>{{item.handlerStatus==1?'待响应':item.handlerStatus==2?'标记误报':item.handlerStatus==3?'自查处理中':item.handlerStatus==4?'已移交上报':item.handlerStatus==5?'待验收':'已完成'}}</span>
</div>
</div>
- <div class="warn-item">
- <div class="i-tit">
- P-8240A 巡检异常！
- </div>
- <div>
- 正常值：<span>8-10Mpa</span>
- </div>
- <div>
- 巡检值：<span>12Mpa</span>
- </div>
- <div>
- 已通知负责人：<span>黄公子</span>
- </div>
- <div>
- 负责人电话：<span>15261806176</span>
- </div>
- <div>
- 工单回执状态：<span>待响应</span>
- </div>
- </div>
+ </div>
+ <div v-else>
+ 暂无异常警报
</div>
</div>
<div class="star-pic">
@@ -154,6 +139,7 @@
socket: any;
socketData: string;
data: Array<any>;
+ excepOrder: Array<any>;
id: string;
defaultImg: string
}
@@ -170,6 +156,7 @@
socketData: '',
socket: null,
data: [],
+ excepOrder: [],
id: '',
defaultImg: new URL('../../../assets/default-img.jpg',import.meta.url).href
});
@@ -215,8 +202,11 @@
};
// 监听socket消息
state.socket.onmessage = (msg) => {
+ console.log(msg.data,'msg.data')
+ console.log(msg.data.rfidInfos,'rfidInfos')
if (msg.data === '连接成功') return;
- userInfos.value.dataList = JSON.parse(msg.data);
+ userInfos.value.dataList = JSON.parse(msg.data).rfidInfos;
+ state.excepOrder = JSON.parse(msg.data).excepOrder;
};
}
} else {
@@ -235,7 +225,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',
@@ -428,16 +423,17 @@
div {
margin-bottom: 5px;
+ display: flex;
+ align-items: flex-start;
&:last-of-type {
margin-bottom: 0;
}
span {
- display: inline-block;
- white-space: nowrap;
width: 50%;
font-size: 13px;
color: #fff;
text-align: left;
+ word-break: break-all;
&:first-of-type {
text-align: right;
@@ -638,16 +634,17 @@
div {
width: 100%;
margin-bottom: 5px;
+ display: flex;
+ align-items: flex-start;
&:last-of-type {
margin-bottom: 0;
}
span {
- display: inline-block;
- white-space: nowrap;
width: 50%;
font-size: 13px;
color: #fff;
text-align: left;
+ word-break: break-all;
&:first-of-type {
text-align: right;
@@ -847,16 +844,17 @@
div {
width: 100%;
margin-bottom: 2px;
+ display: flex;
+ align-items: flex-start;
&:last-of-type {
margin-bottom: 0;
}
span {
width: 50%;
- display: inline-block;
- white-space: nowrap;
font-size: 12px;
color: #fff;
text-align: left;
+ word-break: break-all;
&:first-of-type {
text-align: right;
--
Gitblit v1.9.2