From 60e60cc647fe696a68f211d25d563d677f8b27c2 Mon Sep 17 00:00:00 2001
From: batman <978517621@qq.com>
Date: 星期三, 08 三月 2023 10:54:48 +0800
Subject: [PATCH] 新修改添加页面
---
src/views/intellectInspect/intelligentLine/index.vue | 119 +++++++++++++++++++++++++++++++++++++++++++++++++++--------
1 files changed, 102 insertions(+), 17 deletions(-)
diff --git a/src/views/intellectInspect/intelligentLine/index.vue b/src/views/intellectInspect/intelligentLine/index.vue
index f1d8fe8..af7fa8f 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,51 @@
</div>
<div class="blocks">
<div>
+ <div class="warning-part">
+ <div class="warn-tit">异常警报：</div>
+ <div class="warn-msg">
+ <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 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>
<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>
@@ -68,7 +113,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>
@@ -92,7 +137,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';
@@ -137,8 +182,10 @@
state.id = curId.toString()
getLine(state.id)
getUrl(state.id)
- onScreenfullClick();
});
+ onActivated(()=>{
+ onScreenfullClick();
+ })
const dataList = computed(() => {
return userInfos.value.dataList;
@@ -156,9 +203,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 = () => {
@@ -171,7 +216,6 @@
// 监听socket消息
state.socket.onmessage = (msg) => {
if (msg.data === '连接成功') return;
- console.log(msg.data,'data')
userInfos.value.dataList = JSON.parse(msg.data);
};
}
@@ -191,7 +235,7 @@
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
} else {
ElMessage({
type: 'warning',
@@ -208,7 +252,6 @@
return false;
}
screenfull.toggle(element);
- console.log(111111111111111)
};
// 返回
@@ -1000,11 +1043,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 {
@@ -1359,6 +1402,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