From 1b9fea7d4af68d8f933b2dc42bf6084b9646f64c Mon Sep 17 00:00:00 2001
From: 马宇豪 <978517621@qq.com>
Date: 星期二, 04 三月 2025 08:39:55 +0800
Subject: [PATCH] 修改作业等级名称
---
src/views/intellectInspect/intelligentLine/index.vue | 197 +++++++++++++++++++++++++++++++++++++++---------
1 files changed, 159 insertions(+), 38 deletions(-)
diff --git a/src/views/intellectInspect/intelligentLine/index.vue b/src/views/intellectInspect/intelligentLine/index.vue
index c5521fe..51d5f1b 100644
--- a/src/views/intellectInspect/intelligentLine/index.vue
+++ b/src/views/intellectInspect/intelligentLine/index.vue
@@ -1,14 +1,18 @@
<template>
- <div class="container">
- <div class="big-title" @click="goBack()">国泰新华智能巡检系统</div>
+ <div class="container" id="screenFull">
+ <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="isScreenfull ? $t('message.user.title6') : $t('message.user.title5')" :class="!isScreenfull ? 'icon-fullscreen' : 'icon-tuichuquanping'"></i>
- </div>
- <div>全屏</div>
- </div>
+<!-- <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 class="backBtn" @click="goBack()">
<img src="../../../assets/loginPage/back-icon.png"/>
<div>退出</div>
@@ -16,6 +20,36 @@
</div>
<div class="blocks">
<div>
+ <div class="warning-part" ref="draggableElement">
+ <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>
@@ -64,7 +98,7 @@
<span>参数：</span><span class="target">{{ t.secondReferenceResult + t.quotaUnit }}</span>
</div>
<div>
- <span>巡检结果：</span><span class="target">{{ t.reportResult == null ? '--' : t.reportResult == 0 ? '正常' : '异常' }}</span>
+ <span>巡检结果：</span><span class="target">{{ t.reportResult == null ? '--' : t.reportResult == 0 ? '正常' : t.reportResult == 1 ? '异常' : '备' }}</span>
</div>
</div>
</div>
@@ -88,7 +122,7 @@
<script lang="ts">
import screenfull from 'screenfull';
import { lineApi } from '/@/api/intelligentLine';
-import {toRefs, reactive, ref, onMounted, onUnmounted, computed, nextTick} from 'vue';
+import {toRefs, reactive, ref, onMounted, onUnmounted, computed, nextTick, onActivated} from 'vue';
import {useRoute} from 'vue-router';
import { storeToRefs } from 'pinia';
import { initBackEndControlRoutes } from '/@/router/backEnd';
@@ -101,13 +135,19 @@
// 定义接口来定义对象的类型
interface stateType {
present: string;
- isScreenfull: boolean;
path: string;
socket: any;
socketData: string;
data: Array<any>;
+ excepOrder: Array<any>;
id: string;
- defaultImg: string
+ defaultImg: string;
+ isDragging:boolean
+ initialX:number|null
+ initialY:number|null
+ xOffset:number|null
+ yOffset:number|null
+ timer: null | any
}
export default {
name: 'intelligentLine',
@@ -118,25 +158,37 @@
const route = useRoute();
const state = reactive<stateType>({
present: '',
- isScreenfull: false,
path: '',
socketData: '',
socket: null,
data: [],
+ excepOrder: [],
id: '',
- defaultImg: new URL('../../../assets/default-img.jpg',import.meta.url).href
+ defaultImg: new URL('../../../assets/default-img.jpg',import.meta.url).href,
+ isDragging: false,
+ initialX: 0,
+ initialY: 0,
+ xOffset: 0,
+ yOffset: 0,
+ timer: null
});
onMounted(() => {
- setInterval(() => {
+ state.timer = setInterval(() => {
state.present = new Date().toLocaleString();
}, 1000);
let curId = route.query.id
state.id = curId.toString()
getLine(state.id)
getUrl(state.id)
+ draggableElement.value.addEventListener('mousedown', handleMouseDown);
+ draggableElement.value.addEventListener('mousemove', handleMouseMove);
+ draggableElement.value.addEventListener('mouseup', handleMouseUp);
});
-
+ onActivated(()=>{
+ onScreenfullClick();
+ })
+ const draggableElement = ref(null);
const dataList = computed(() => {
return userInfos.value.dataList;
});
@@ -153,9 +205,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 = () => {
@@ -167,9 +217,11 @@
};
// 监听socket消息
state.socket.onmessage = (msg) => {
+ console.log(msg.data,'msg.data')
+ console.log(msg.data.rfidInfos,'rfidInfos')
if (msg.data === '连接成功') return;
- console.log(msg.data,'data')
- userInfos.value.dataList = JSON.parse(msg.data);
+ userInfos.value.dataList = JSON.parse(msg.data).rfidInfos;
+ state.excepOrder = JSON.parse(msg.data).excepOrder;
};
}
} else {
@@ -188,7 +240,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',
@@ -199,24 +256,37 @@
// 全屏
const onScreenfullClick = () => {
+ const element = document.getElementById('screenFull')
if (!screenfull.isEnabled) {
ElMessage.warning('暂不不支持全屏');
return false;
}
- screenfull.toggle();
- screenfull.on('change', () => {
- if (screenfull.isFullscreen) {
- state.isScreenfull = true;
- } else {
- state.isScreenfull = false;
- }
- });
+ screenfull.toggle(element);
};
// 返回
const goBack = () => {
window.history.go(-1);
};
+
+ const handleMouseDown = (e) => {
+ state.initialX = e.clientX - state.xOffset;
+ state.initialY = e.clientY - state.yOffset;
+ state.isDragging = true;
+ };
+
+ const handleMouseMove = (e) => {
+ if (state.isDragging) {
+ state.xOffset = e.clientX - state.initialX;
+ state.yOffset = e.clientY - state.initialY;
+
+ draggableElement.value.style.transform = `translate3d(${state.xOffset}px, ${state.yOffset}px, 0)`;
+ }
+ };
+
+ const handleMouseUp = () => {
+ state.isDragging = false;
+ };
// 页面关闭处理
onUnmounted(() => {
@@ -226,9 +296,14 @@
console.log('socket已经关闭');
};
})
+ clearInterval(state.timer)
+ draggableElement.value.removeEventListener('mousedown', handleMouseDown);
+ draggableElement.value.removeEventListener('mousemove', handleMouseMove);
+ draggableElement.value.removeEventListener('mouseup', handleMouseUp);
});
return {
dataList,
+ draggableElement,
goBack,
onScreenfullClick,
...toRefs(state)
@@ -387,16 +462,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;
@@ -597,16 +673,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;
@@ -806,16 +883,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;
@@ -1002,11 +1080,11 @@
width: 100%;
height: 100%;
display: flex;
- justify-content: center;
+ justify-content: left;
align-items: flex-start;
+ overflow-y: hidden;
+ overflow-x: hidden;
overflow: auto;
- &::-webkit-scrollbar { width: 0; height: 0; color: transparent; }
- &::scrollbar { width: 0; height: 0; color: transparent; }
}
.line-map {
@@ -1361,6 +1439,49 @@
}
}
}
+ .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);
+ backdrop-filter: blur(5px);
+
+ .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