From 2c4edb31e7da37c98e5660ab478f43e01a77003c Mon Sep 17 00:00:00 2001 From: 马宇豪 <978517621@qq.com> Date: 星期二, 14 三月 2023 15:57:10 +0800 Subject: [PATCH] 修改指标选择 --- src/views/intellectInspect/intelligentLine/index.vue | 32 +++++++++++++++++++------------- 1 files changed, 19 insertions(+), 13 deletions(-) diff --git a/src/views/intellectInspect/intelligentLine/index.vue b/src/views/intellectInspect/intelligentLine/index.vue index c47d429..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> @@ -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 { @@ -420,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; @@ -630,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; @@ -839,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