From a4bcd1eb9305e2c1b77c7847c2f4a979c0e95e93 Mon Sep 17 00:00:00 2001
From: batman <978517621@qq.com>
Date: 星期一, 13 三月 2023 19:45:50 +0800
Subject: [PATCH] 新修改添加页面
---
src/views/intellectInspect/intelligentLine/index.vue | 19 +++++++++++--------
1 files changed, 11 insertions(+), 8 deletions(-)
diff --git a/src/views/intellectInspect/intelligentLine/index.vue b/src/views/intellectInspect/intelligentLine/index.vue
index d9b1a5c..de17046 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>
@@ -168,7 +168,7 @@
let curId = route.query.id
state.id = curId.toString()
getLine(state.id)
- // getUrl(state.id)
+ getUrl(state.id)
});
onActivated(()=>{
onScreenfullClick();
@@ -202,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 {
--
Gitblit v1.9.2